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

bug #117283 (r=nisheeth@netscape.com, sr=jst@netscape.com, a=edt). window.close and a java applet introduced a race condition which hangs the browser... This is just a band-aid to avoid the race.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_0_9_4_BRANCH@111846 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2002-01-10 19:35:10 +00:00
parent 180fcf67fb
commit df6ef13182
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -272,22 +272,6 @@ nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)
NS_ADDREF((nsISupports*)*aInstancePtr);
return NS_OK;
}
else if(aIID.Equals(NS_GET_IID(nsIScriptGlobalObject)))
{
NS_ENSURE_SUCCESS(EnsureScriptEnvironment(), NS_ERROR_FAILURE);
*aInstancePtr = mScriptGlobal;
NS_ADDREF((nsISupports*)*aInstancePtr);
return NS_OK;
}
else if(aIID.Equals(NS_GET_IID(nsIDOMWindowInternal)) ||
aIID.Equals(NS_GET_IID(nsIDOMWindow)))
{
NS_ENSURE_SUCCESS(EnsureScriptEnvironment(), NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(mScriptGlobal->QueryInterface(aIID, aInstancePtr),
NS_ERROR_FAILURE);
return NS_OK;
}
if (!*aInstancePtr || NS_FAILED(rv))
return nsDocShell::GetInterface(aIID,aInstancePtr);