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

part of the fix to bug 66950. r=rogerl sr=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@86057 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jband%netscape.com
2001-02-02 08:38:06 +00:00
parent 73bae8fde6
commit 0e9f463997
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/dom/src/base/nsJSEnvironment.cpp
View File

@@ -1447,12 +1447,14 @@ const char kJSRuntimeServiceContractID[] = "@mozilla.org/js/xpc/RuntimeService;1
static int globalCount;
static PRThread *gDOMThread;
static JSGCCallback gOldJSGCCallback;
static JSBool PR_CALLBACK
DOMGCCallback(JSContext *cx, JSGCStatus status)
{
if (status == JSGC_BEGIN && PR_GetCurrentThread() != gDOMThread)
return JS_FALSE;
return JS_TRUE;
return gOldJSGCCallback ? gOldJSGCCallback(cx, status) : JS_TRUE;
}
nsJSEnvironment::nsJSEnvironment()
@@ -1483,7 +1485,9 @@ nsJSEnvironment::nsJSEnvironment()
return; // XXX swallow error! need Init()?
gDOMThread = PR_GetCurrentThread();
::JS_SetGCCallbackRT(mRuntime, DOMGCCallback);
NS_ASSERTION(!gOldJSGCCallback, "nsJSEnvironment created more than once");
gOldJSGCCallback = ::JS_SetGCCallbackRT(mRuntime, DOMGCCallback);
// Initialize LiveConnect. XXXbe use contractid rather than GetCID
NS_WITH_SERVICE(nsILiveConnectManager, manager,