corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 199006 there are two independent initializations of nsMemoryImpl before Init_XPCOM2 finishes

Browse Source 
r=dougt
This commit is contained in:
timeless@mozdev.org
2003-04-07 14:20:19 +00:00
parent e26e52c83d
commit f877e91489
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xpcom/base/nsMemoryImpl.cpp
View File

@@ -212,6 +212,8 @@ MemoryFlusher::Stop()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
nsMemoryImpl* gMemory = nsnull;
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMemoryImpl, nsIMemory) NS_IMPL_THREADSAFE_ISUPPORTS1(nsMemoryImpl, nsIMemory)
NS_METHOD NS_METHOD
@@ -219,6 +221,8 @@ nsMemoryImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
{ {
NS_ENSURE_ARG_POINTER(aInstancePtr); NS_ENSURE_ARG_POINTER(aInstancePtr);
NS_ENSURE_PROPER_AGGREGATION(outer, aIID); NS_ENSURE_PROPER_AGGREGATION(outer, aIID);
if (gMemory && NS_SUCCEEDED(gMemory->QueryInterface(aIID, aInstancePtr)))
return NS_OK;
nsMemoryImpl* mm = new nsMemoryImpl(); nsMemoryImpl* mm = new nsMemoryImpl();
if (mm == NULL) if (mm == NULL)
@@ -484,8 +488,6 @@ nsMemoryImpl::DestroyFlushEvent(PLEvent* aEvent)
// no-op, since mEvent is a member of nsMemoryImpl // no-op, since mEvent is a member of nsMemoryImpl
} }
nsMemoryImpl* gMemory = nsnull;
static void static void
EnsureGlobalMemoryService() EnsureGlobalMemoryService()
{ {