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

Bug 1428795 - Uninitalise Marionette on xpcom-will-shutdown. r=automatedtester

Browse Source 
Marionette was previously uninitialised when xpcom-shutdown fired.
This may be too late to reset preferences and other state related
to the browser.

This patch moves Marionette to run uninitialisation code on
xpcom-will-shutdown.

MozReview-Commit-ID: 3ytX2k2rrOp

--HG--
extra : rebase_source : 6b9918515b48b2d1166cc985c5d5aeeb82937db0
This commit is contained in:
Andreas Tolfsen 2018-02-26 20:36:29 +00:00
parent 00a171e75d
commit 1d2ab66b43
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/marionette/components/marionette.js
View File

@ -462,7 +462,7 @@ class MarionetteMainProcess {
if (this.gfxWindow === null || subject === this.gfxWindow) {
Services.obs.removeObserver(this, topic);
Services.obs.addObserver(this, "xpcom-shutdown");
Services.obs.addObserver(this, "xpcom-will-shutdown");
this.finalUIStartup = true;
this.init();
}
@ -491,15 +491,15 @@ class MarionetteMainProcess {
if (this.gfxWindow) {
Services.obs.addObserver(this, "domwindowclosed");
} else {
Services.obs.addObserver(this, "xpcom-shutdown");
Services.obs.addObserver(this, "xpcom-will-shutdown");
this.finalUIStartup = true;
this.init();
}
break;
case "xpcom-shutdown":
Services.obs.removeObserver(this, "xpcom-shutdown");
case "xpcom-will-shutdown":
Services.obs.removeObserver(this, "xpcom-will-shutdown");
this.uninit();
break;
}