wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Followup for bug 534341 (XPConnect should not unroot globals of non-main thread contexts). r=bent, sr=jst.

Browse Source 
--HG--
extra : rebase_source : 1a21a5b4646b0d1bd4b2a20bbbe460bba7fc78fc
This commit is contained in:
Peter Van der Beken 2010-01-13 14:50:01 +01:00
parent 48bc8e7aca
commit 812feed9d8
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,7 @@ void XPCJSRuntime::UnrootContextGlobals()
{
NS_ASSERTION(!JS_HAS_OPTION(acx, JSOPTION_UNROOTED_GLOBAL),
"unrooted global should be set only during CC");
if(XPCPerThreadData::IsMainThreadContext(acx) &&
if(XPCPerThreadData::IsMainThread(acx) &&
nsXPConnect::GetXPConnect()->GetRequestDepth(acx) == 0)
{
JS_ClearNewbornRoots(acx);

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

@ -3441,11 +3441,6 @@ public:
return GetDataImpl(cx);
}
static inline JSBool IsMainThreadContext(JSContext *cx)
{
return cx->thread == sMainJSThread;
}
static void CleanupAllThreads();
~XPCPerThreadData();