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

Bug 1382968 - Only try to forward console messages from content processes to parent when browser console/toolbox are opened. r=jryans,tromey

Browse Source 
MozReview-Commit-ID: 8cFUbF4msHx
This commit is contained in:
Alexandre Poirot
2017-08-01 16:51:07 +02:00
parent 0a2f85415b
commit d7402fa992
7 changed files with 204 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/processsingleton/MainProcessSingleton.js
View File

@@ -18,12 +18,6 @@ MainProcessSingleton.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
logConsoleMessage(message) {
let logMsg = message.data;
logMsg.wrappedJSObject = logMsg;
Services.obs.notifyObservers(logMsg, "console-api-log-event");
},
// Called when a webpage calls window.external.AddSearchProvider
addSearchEngine({ target: browser, data: { pageURL, engineURL } }) {
pageURL = NetUtil.newURI(pageURL);
@@ -73,14 +67,12 @@ MainProcessSingleton.prototype = {
// before other frame scripts.
Services.mm.loadFrameScript("chrome://global/content/browser-content.js", true);
Services.ppmm.loadProcessScript("chrome://global/content/process-content.js", true);
Services.ppmm.addMessageListener("Console:Log", this.logConsoleMessage);
Services.mm.addMessageListener("Search:AddEngine", this.addSearchEngine);
Services.ppmm.loadProcessScript("resource:///modules/ContentObservers.js", true);
break;
}
case "xpcom-shutdown":
Services.ppmm.removeMessageListener("Console:Log", this.logConsoleMessage);
Services.mm.removeMessageListener("Search:AddEngine", this.addSearchEngine);
break;
}