Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 07:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 896523 - In Firefox, Console.log does not work from apps launched within the system app. r=msucan

Browse Source
This commit is contained in:
Paul Rouget 2014-01-24 08:33:31 -05:00
parent 1e11a7edbc
commit 35670b7842
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/devtools/LayoutHelpers.jsm
View File

@ -344,6 +344,22 @@ LayoutHelpers.prototype = {
return docShell === this._topDocShell;
},
/**
* Check a window is part of the top level window.
*/
isIncludedInTopLevelWindow: function LH_isIncludedInTopLevelWindow(win) {
if (this.isTopLevelWindow(win)) {
return true;
}
let parent = this.getParentWindow(win);
if (!parent || parent === win) {
return false;
}
return this.isIncludedInTopLevelWindow(parent);
},
/**
* like win.parent, but goes through mozbrowsers and mozapps iframes.
*/

11
toolkit/devtools/webconsole/utils.js
View File

@ -15,6 +15,7 @@ loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");
loader.lazyImporter(this, "ConsoleAPIStorage", "resource://gre/modules/ConsoleAPIStorage.jsm");
loader.lazyImporter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
loader.lazyImporter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm");
loader.lazyImporter(this, "LayoutHelpers", "resource://gre/modules/devtools/LayoutHelpers.jsm");
loader.lazyServiceGetter(this, "gActivityDistributor",
"@mozilla.org/network/http-activity-distributor;1",
"nsIHttpActivityDistributor");
@ -1072,6 +1073,9 @@ function ConsoleServiceListener(aWindow, aListener)
{
this.window = aWindow;
this.listener = aListener;
if (this.window) {
this.layoutHelpers = new LayoutHelpers(this.window);
}
}
exports.ConsoleServiceListener = ConsoleServiceListener;
@ -1121,7 +1125,7 @@ ConsoleServiceListener.prototype =
}
let errorWindow = Services.wm.getOuterWindowWithId(aMessage.outerWindowID);
if (!errorWindow || errorWindow.top != this.window) {
if (!errorWindow || !this.layoutHelpers.isIncludedInTopLevelWindow(errorWindow)) {
return;
}
}
@ -1243,6 +1247,9 @@ function ConsoleAPIListener(aWindow, aOwner)
{
this.window = aWindow;
this.owner = aOwner;
if (this.window) {
this.layoutHelpers = new LayoutHelpers(this.window);
}
}
exports.ConsoleAPIListener = ConsoleAPIListener;
@ -1294,7 +1301,7 @@ ConsoleAPIListener.prototype =
let apiMessage = aMessage.wrappedJSObject;
if (this.window) {
let msgWindow = Services.wm.getOuterWindowWithId(apiMessage.ID);
if (!msgWindow || msgWindow.top != this.window) {
if (!msgWindow || !this.layoutHelpers.isIncludedInTopLevelWindow(msgWindow)) {
// Not the same window!
return;
}