Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Timer re-init to drop any old references (215163, sr=dbaron, r?pavlov).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@145637 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2003-08-06 00:37:43 +00:00
parent be83f0b4b4
commit 026e7fdb90
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpcom/threads/nsTimerImpl.cpp
View File

@@ -177,10 +177,7 @@ nsTimerImpl::nsTimerImpl() :
nsTimerImpl::~nsTimerImpl()
{
if (mCallbackType == CALLBACK_TYPE_INTERFACE)
NS_RELEASE(mCallback.i);
else if (mCallbackType == CALLBACK_TYPE_OBSERVER)
NS_RELEASE(mCallback.o);
ReleaseCallback();
}
@@ -241,6 +238,7 @@ NS_IMETHODIMP nsTimerImpl::InitWithFuncCallback(nsTimerCallbackFunc aFunc,
if (!gThread)
return NS_ERROR_FAILURE;
ReleaseCallback();
mCallbackType = CALLBACK_TYPE_FUNC;
mCallback.c = aFunc;
mClosure = aClosure;
@@ -255,6 +253,7 @@ NS_IMETHODIMP nsTimerImpl::InitWithCallback(nsITimerCallback *aCallback,
if (!gThread)
return NS_ERROR_FAILURE;
ReleaseCallback();
mCallbackType = CALLBACK_TYPE_INTERFACE;
mCallback.i = aCallback;
NS_ADDREF(mCallback.i);
@@ -269,6 +268,7 @@ NS_IMETHODIMP nsTimerImpl::Init(nsIObserver *aObserver,
if (!gThread)
return NS_ERROR_FAILURE;
ReleaseCallback();
mCallbackType = CALLBACK_TYPE_OBSERVER;
mCallback.o = aObserver;
NS_ADDREF(mCallback.o);

9
mozilla/xpcom/threads/nsTimerImpl.h
View File

@@ -42,6 +42,7 @@
#include "nsVoidArray.h"
#include "nsIThread.h"
#include "nsITimerInternal.h"
#include "nsIObserver.h"
#include "nsCOMPtr.h"
@@ -103,6 +104,14 @@ public:
private:
nsresult InitCommon(PRUint32 aType, PRUint32 aDelay);
void ReleaseCallback()
{
if (mCallbackType == CALLBACK_TYPE_INTERFACE)
NS_RELEASE(mCallback.i);
else if (mCallbackType == CALLBACK_TYPE_OBSERVER)
NS_RELEASE(mCallback.o);
}
nsCOMPtr<nsIThread> mCallingThread;
void * mClosure;