Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 818296 - Don't NukeCrossCompartment on optimized shutdown. r=khuey

Browse Source
This commit is contained in:
Benoit Girard 2012-12-07 11:54:46 -05:00
parent b82bf8c2e7
commit 65bfd8db0e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/base/nsGlobalWindow.cpp
View File

@ -150,6 +150,8 @@
#include "nsIDOMFile.h"
#include "nsIDOMFileList.h"
#include "nsIURIFixup.h"
#include "nsIAppStartup.h"
#include "nsToolkitCompsCID.h"
#include "nsCDefaultURIFixup.h"
#include "nsEventDispatcher.h"
#include "nsIObserverService.h"
@ -6933,9 +6935,19 @@ public:
}
}
bool skipNukeCrossCompartment = false;
#ifndef DEBUG
nsCOMPtr<nsIAppStartup> appStartup =
do_GetService(NS_APPSTARTUP_CONTRACTID);
if (appStartup) {
appStartup->GetShuttingDown(&skipNukeCrossCompartment);
}
#endif
nsCOMPtr<nsPIDOMWindow> window = do_QueryReferent(mWindow);
if (window) {
nsGlobalWindow* currentInner =
if (!skipNukeCrossCompartment && window) {
nsGlobalWindow* currentInner =
window->IsInnerWindow() ? static_cast<nsGlobalWindow*>(window.get()) :
static_cast<nsGlobalWindow*>(window->GetCurrentInnerWindow());
NS_ENSURE_TRUE(currentInner, NS_OK);