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

Fix for bug 490592 (Possible to GC way too much during shutdown due to XUL and XBL prototypes). r/sr=bz.

Browse Source 
--HG--
extra : rebase_source : 8a05db1e4aab7dde3b38c7613488314dde05f163
This commit is contained in:
Peter Van der Beken 2009-05-07 11:19:41 -07:00
parent b865be6ac9
commit 1ec8d2bfcb
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/xbl/src/nsXBLDocumentInfo.cpp
View File

@ -265,6 +265,7 @@ nsXBLDocGlobalObject::SetContext(nsIScriptContext *aScriptContext)
nsresult rv; nsresult rv;
rv = aScriptContext->InitContext(nsnull); rv = aScriptContext->InitContext(nsnull);
NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Script Language's InitContext failed"); NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Script Language's InitContext failed");
aScriptContext->SetGCOnDestruction(PR_FALSE);
aScriptContext->DidInitializeContext(); aScriptContext->DidInitializeContext();
// and we set up our global manually // and we set up our global manually
mScriptContext = aScriptContext; mScriptContext = aScriptContext;

1
content/xul/document/src/nsXULPrototypeDocument.cpp
View File

@ -693,6 +693,7 @@ nsXULPDGlobalObject::SetScriptContext(PRUint32 lang_id, nsIScriptContext *aScrip
void *script_glob = nsnull; void *script_glob = nsnull;
if (aScriptContext) { if (aScriptContext) {
aScriptContext->SetGCOnDestruction(PR_FALSE);
aScriptContext->DidInitializeContext(); aScriptContext->DidInitializeContext();
script_glob = aScriptContext->GetNativeGlobal(); script_glob = aScriptContext->GetNativeGlobal();
NS_ASSERTION(script_glob, "GetNativeGlobal returned NULL!"); NS_ASSERTION(script_glob, "GetNativeGlobal returned NULL!");

15
dom/base/nsDOMScriptObjectFactory.cpp
View File

@ -278,21 +278,6 @@ nsDOMScriptObjectFactory::Observe(nsISupports *aSubject,
cache->Flush(); cache->Flush();
#endif #endif
nsCOMPtr<nsIThreadJSContextStack> stack =
do_GetService("@mozilla.org/js/xpc/ContextStack;1");
if (stack) {
JSContext *cx = nsnull;
stack->GetSafeJSContext(&cx);
if (cx) {
// Do one final GC to clean things up before shutdown.
::JS_GC(cx);
}
}
nsGlobalWindow::ShutDown(); nsGlobalWindow::ShutDown();
nsDOMClassInfo::ShutDown(); nsDOMClassInfo::ShutDown();

2
js/src/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -1674,8 +1674,6 @@ mozJSComponentLoader::Observe(nsISupports *subject, const char *topic,
mFastLoadTimer->Cancel(); mFastLoadTimer->Cancel();
} }
JS_GC(mContext);
CloseFastLoad(); CloseFastLoad();
} }
else if (!strcmp(topic, "xpcom-shutdown-loaders")) { else if (!strcmp(topic, "xpcom-shutdown-loaders")) {