wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1053733 - SettingsManager sends register message to SettingsChangeNotifier again when receives Settings:Notifier:Init:OK. r=qdot

Browse Source
This commit is contained in:
Edgar Chen 2014-08-14 12:17:39 +08:00
parent 14e0927018
commit a7b21f36f2
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/settings/SettingsChangeNotifier.jsm
View File

@ -37,6 +37,9 @@ this.SettingsChangeNotifier = {
Services.obs.addObserver(this, kXpcomShutdownObserverTopic, false);
Services.obs.addObserver(this, kMozSettingsChangedObserverTopic, false);
// Broadcast when SettingChangeNotifier finishes init process.
ppmm.broadcastAsyncMessage("Settings:Notifier:Init:OK");
},
observe: function(aSubject, aTopic, aData) {

11
dom/settings/SettingsManager.js
View File

@ -319,6 +319,14 @@ SettingsManager.prototype = {
if (DEBUG) debug("no observers stored!");
}
break;
case "Settings:Notifier:Init:OK":
// If SettingManager receives this message means SettingChangeNotifier
// might not receive the Settings:RegisterForMessage message. We should
// send it again after SettingChangeNotifier is ready.
if (this.hasReadPrivileges) {
cpmm.sendAsyncMessage("Settings:RegisterForMessages");
}
break;
default:
if (DEBUG) debug("Wrong message: " + aMessage.name);
}
@ -327,7 +335,6 @@ SettingsManager.prototype = {
addObserver: function addObserver(aName, aCallback) {
if (DEBUG) debug("addObserver " + aName);
if (!this._callbacks) {
cpmm.sendAsyncMessage("Settings:RegisterForMessages");
this._callbacks = {};
}
if (!this._callbacks[aName]) {
@ -354,6 +361,7 @@ SettingsManager.prototype = {
init: function(aWindow) {
mrm.registerStrongReporter(this);
cpmm.addMessageListener("Settings:Change:Return:OK", this);
cpmm.addMessageListener("Settings:Notifier:Init:OK", this);
this._window = aWindow;
Services.obs.addObserver(this, "inner-window-destroyed", false);
let util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
@ -411,6 +419,7 @@ SettingsManager.prototype = {
cleanup: function() {
Services.obs.removeObserver(this, "inner-window-destroyed");
cpmm.removeMessageListener("Settings:Change:Return:OK", this);
cpmm.removeMessageListener("Settings:Notifier:Init:OK", this);
mrm.unregisterStrongReporter(this);
this._requests = null;
this._window = null;