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 1016031 - Fix ProfD race in b2g child processes. r=fabrice

Browse Source
This commit is contained in:
Alexandre Poirot 2014-05-26 10:39:00 +02:00
parent d0c33feb10
commit 1e8598317b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
b2g/chrome/content/shell.js
View File

@ -358,9 +358,6 @@ var shell = {
ppmm.addMessageListener("sms-handler", this); ppmm.addMessageListener("sms-handler", this);
ppmm.addMessageListener("mail-handler", this); ppmm.addMessageListener("mail-handler", this);
ppmm.addMessageListener("file-picker", this); ppmm.addMessageListener("file-picker", this);
ppmm.addMessageListener("getProfD", function(message) {
return Services.dirsvc.get("ProfD", Ci.nsIFile).path;
});
}, },
stop: function shell_stop() { stop: function shell_stop() {

10
b2g/components/ProcessGlobal.js
View File

@ -43,6 +43,16 @@ ProcessGlobal.prototype = {
switch (topic) { switch (topic) {
case 'app-startup': { case 'app-startup': {
Services.obs.addObserver(this, 'console-api-log-event', false); Services.obs.addObserver(this, 'console-api-log-event', false);
let inParent = Cc["@mozilla.org/xre/app-info;1"]
.getService(Ci.nsIXULRuntime)
.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
if (inParent) {
let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
.getService(Ci.nsIMessageListenerManager);
ppmm.addMessageListener("getProfD", function(message) {
return Services.dirsvc.get("ProfD", Ci.nsIFile).path;
});
}
break; break;
} }
case 'console-api-log-event': { case 'console-api-log-event': {