Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 744836: Modify nsTimerEvent to hold its timer reference until the nsTimerEvent itself is destroyed. r=bsmedberg,ehsan

Browse Source
This commit is contained in:
Aaron Klotz 2013-05-30 10:19:18 -06:00
parent 842845f41c
commit c3f0a98c51
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xpcom/threads/nsTimerImpl.cpp
View File

@ -106,7 +106,7 @@ public:
NS_IMETHOD Run(); NS_IMETHOD Run();
nsTimerEvent(nsTimerImpl *timer, int32_t generation) nsTimerEvent(nsTimerImpl *timer, int32_t generation)
: mTimer(timer), mGeneration(generation) { : mTimer(dont_AddRef(timer)), mGeneration(generation) {
// timer is already addref'd for us // timer is already addref'd for us
MOZ_COUNT_CTOR(nsTimerEvent); MOZ_COUNT_CTOR(nsTimerEvent);
@ -135,10 +135,6 @@ public:
private: private:
nsTimerEvent(); // Not implemented nsTimerEvent(); // Not implemented
~nsTimerEvent() { ~nsTimerEvent() {
#ifdef DEBUG
if (mTimer)
NS_WARNING("leaking reference to nsTimerImpl");
#endif
MOZ_COUNT_DTOR(nsTimerEvent); MOZ_COUNT_DTOR(nsTimerEvent);
MOZ_ASSERT(!sCanDeleteAllocator || sAllocatorUsers > 0, MOZ_ASSERT(!sCanDeleteAllocator || sAllocatorUsers > 0,
@ -146,7 +142,7 @@ private:
PR_ATOMIC_DECREMENT(&sAllocatorUsers); PR_ATOMIC_DECREMENT(&sAllocatorUsers);
} }
nsTimerImpl *mTimer; nsRefPtr<nsTimerImpl> mTimer;
int32_t mGeneration; int32_t mGeneration;
static TimerEventAllocator* sAllocator; static TimerEventAllocator* sAllocator;
@ -616,10 +612,7 @@ void nsTimerEvent::DeleteAllocatorIfNeeded()
NS_IMETHODIMP nsTimerEvent::Run() NS_IMETHODIMP nsTimerEvent::Run()
{ {
nsRefPtr<nsTimerImpl> timer; if (mGeneration != mTimer->GetGeneration())
timer.swap(mTimer);
if (mGeneration != timer->GetGeneration())
return NS_OK; return NS_OK;
#ifdef DEBUG_TIMERS #ifdef DEBUG_TIMERS
@ -631,7 +624,7 @@ NS_IMETHODIMP nsTimerEvent::Run()
} }
#endif #endif
timer->Fire(); mTimer->Fire();
return NS_OK; return NS_OK;
} }