Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 12:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make DEBUG_CC compile again (broken by the fix for bug 458099). r=bent, NPOTB.

Browse Source
This commit is contained in:
Peter Van der Beken 2009-01-14 13:24:10 +01:00
parent e99a0fd85e
commit 1a76d6b1c6
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/xpconnect/src/nsXPConnect.cpp
View File

@ -553,7 +553,7 @@ nsXPConnect::BeginCycleCollection(nsCycleCollectionTraversalCallback &cb)
return NS_ERROR_OUT_OF_MEMORY;
}
GetRuntime()->UnsetContextGlobals();
GetRuntime()->UnrootContextGlobals();
PRBool alreadyCollecting = mCycleCollecting;
mCycleCollecting = PR_TRUE;
@ -600,7 +600,7 @@ nsXPConnect::FinishCycleCollection()
mCycleCollectionContext = nsnull;
mExplainCycleCollectionContext = nsnull;
GetRuntime()->RestoreContextGlobals();
GetRuntime()->RootContextGlobals();
}
#endif

16
js/src/xpconnect/src/xpcjsruntime.cpp
View File

@ -461,6 +461,22 @@ void XPCJSRuntime::UnrootContextGlobals()
}
}
#ifdef DEBUG_CC
void XPCJSRuntime::RootContextGlobals()
{
JSContext *iter = nsnull, *acx;
while((acx = JS_ContextIterator(GetJSRuntime(), &iter)))
{
if(JS_HAS_OPTION(acx, JSOPTION_UNROOTED_GLOBAL))
{
JS_ToggleOptions(acx, JSOPTION_UNROOTED_GLOBAL);
--mUnrootedGlobalCount;
}
}
NS_ASSERTION(mUnrootedGlobalCount == 0, "bad state");
}
#endif
// static
JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
{

3
js/src/xpconnect/src/xpcprivate.h
View File

@ -728,6 +728,9 @@ public:
nsresult RemoveJSHolder(void* aHolder);
void UnrootContextGlobals();
#ifdef DEBUG_CC
void RootContextGlobals();
#endif
void DebugDump(PRInt16 depth);