corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 935846, nsJSEnvironment should get a shutdown notification also in child processes, r=romaxa

Browse Source
This commit is contained in:
Olli Pettay
2014-10-22 18:57:32 +03:00
parent 5fc1090f24
commit d13e546b25
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsJSEnvironment.cpp
View File

@@ -282,7 +282,8 @@ nsJSEnvironmentObserver::Observe(nsISupports* aSubject, const char* aTopic,
nsJSContext::NonIncrementalGC, nsJSContext::NonIncrementalGC,
nsJSContext::ShrinkingGC); nsJSContext::ShrinkingGC);
} }
} else if (!nsCRT::strcmp(aTopic, "quit-application")) { } else if (!nsCRT::strcmp(aTopic, "quit-application") ||
!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
sShuttingDown = true; sShuttingDown = true;
KillTimers(); KillTimers();
} }
@@ -2848,6 +2849,7 @@ nsJSContext::EnsureStatics()
nsIObserver* observer = new nsJSEnvironmentObserver(); nsIObserver* observer = new nsJSEnvironmentObserver();
obs->AddObserver(observer, "memory-pressure", false); obs->AddObserver(observer, "memory-pressure", false);
obs->AddObserver(observer, "quit-application", false); obs->AddObserver(observer, "quit-application", false);
obs->AddObserver(observer, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
// Bug 907848 - We need to explicitly get the nsIDOMScriptObjectFactory // Bug 907848 - We need to explicitly get the nsIDOMScriptObjectFactory
// service in order to force its constructor to run, which registers a // service in order to force its constructor to run, which registers a