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 861495 - Transplant getOuterWindowWithId from nsIDOMWindowUtils to a window-related service: WebConsoleUtils.jsm. r=msucan

Browse Source
This commit is contained in:
Colby Russell 2013-05-07 12:34:21 -04:00
parent cc951baa7d
commit a6dff54387
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
toolkit/devtools/webconsole/WebConsoleUtils.jsm
View File

@ -157,31 +157,6 @@ this.WebConsoleUtils = {
getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
},
/**
* Gets the window that has the given outer ID.
*
* @param integer aOuterId
* @param nsIDOMWindow [aHintWindow]
* Optional, the window object used to QueryInterface to
* nsIDOMWindowUtils. If this is not given,
* Services.wm.getMostRecentWindow() is used.
* @return nsIDOMWindow|null
* The window object with the given outer ID.
*/
getWindowByOuterId: function WCU_getWindowByOuterId(aOuterId, aHintWindow)
{
let someWindow = aHintWindow || Services.wm.getMostRecentWindow(null);
let content = null;
if (someWindow) {
let windowUtils = someWindow.QueryInterface(Ci.nsIInterfaceRequestor).
getInterface(Ci.nsIDOMWindowUtils);
content = windowUtils.getOuterWindowWithId(aOuterId);
}
return content;
},
/**
* Abbreviates the given source URL so that it can be displayed flush-right
* without being too distracting.
@ -1331,8 +1306,7 @@ PageErrorListener.prototype =
}
let errorWindow =
WebConsoleUtils.getWindowByOuterId(aScriptError.outerWindowID,
this.window);
Services.wm.getOuterWindowById(aScriptError.outerWindowID);
if (!errorWindow || errorWindow.top != this.window) {
return;
}
@ -1471,8 +1445,7 @@ ConsoleAPIListener.prototype =
let apiMessage = aMessage.wrappedJSObject;
if (this.window) {
let msgWindow = WebConsoleUtils.getWindowByOuterId(apiMessage.ID,
this.window);
let msgWindow = Services.wm.getOuterWindowById(apiMessage.ID);
if (!msgWindow || msgWindow.top != this.window) {
// Not the same window!
return;