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

Backing out attempted fix for bug 341592, since it didn't fix it, apparently,

Browse Source 
and caused bug 341700.


git-svn-id: svn://10.0.0.236/trunk@201201 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2006-06-29 04:30:51 +00:00
parent c53993be57
commit db81021377
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp
View File

@ -94,17 +94,6 @@ nsDOMScriptObjectFactory::nsDOMScriptObjectFactory() :
NS_CreateJSRuntime(getter_AddRefs(mLanguageArray[NS_STID_INDEX(nsIProgrammingLanguage::JAVASCRIPT)]));
}
nsDOMScriptObjectFactory::~nsDOMScriptObjectFactory()
{
PRUint32 i;
NS_STID_FOR_INDEX(i) {
if (mLanguageArray[i] != nsnull) {
mLanguageArray[i]->ShutDown();
mLanguageArray[i] = nsnull;
}
}
}
NS_INTERFACE_MAP_BEGIN(nsDOMScriptObjectFactory)
NS_INTERFACE_MAP_ENTRY(nsIDOMScriptObjectFactory)
NS_INTERFACE_MAP_ENTRY(nsIObserver)
@ -296,6 +285,14 @@ nsDOMScriptObjectFactory::Observe(nsISupports *aSubject,
nsGlobalWindow::ShutDown();
nsDOMClassInfo::ShutDown();
PRUint32 i;
NS_STID_FOR_INDEX(i) {
if (mLanguageArray[i] != nsnull) {
mLanguageArray[i]->ShutDown();
mLanguageArray[i] = nsnull;
}
}
nsCOMPtr<nsIExceptionService> xs =
do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID);
@ -308,10 +305,6 @@ nsDOMScriptObjectFactory::Observe(nsISupports *aSubject,
xs->UnregisterExceptionProvider(this, NS_ERROR_MODULE_DOM_XPATH);
xs->UnregisterExceptionProvider(this, NS_ERROR_MODULE_XPCONNECT);
}
// Note that we do *not* cleanup the script language references held
// in the nsDOMScriptObjectFactory service - they may be required
// after this is called, as other things shut down and release their
// script object references.
}
return NS_OK;