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: ConsoleAPITests.js; r=msucan

Browse Source
This commit is contained in:
Colby Russell 2013-05-08 19:54:43 +03:00
parent 800f2b6ca9
commit 54989877c3
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dom/tests/browser/browser_ConsoleAPITests.js
View File

@ -34,7 +34,7 @@ function test() {
}
function testConsoleData(aMessageObject) {
let messageWindow = getWindowByWindowId(aMessageObject.ID);
let messageWindow = Services.wm.getOuterWindowWithId(aMessageObject.ID);
is(messageWindow, gWindow, "found correct window by window ID");
is(aMessageObject.level, gLevel, "expected level received");
@ -56,7 +56,7 @@ function testConsoleData(aMessageObject) {
}
function testLocationData(aMessageObject) {
let messageWindow = getWindowByWindowId(aMessageObject.ID);
let messageWindow = Services.wm.getOuterWindowWithId(aMessageObject.ID);
is(messageWindow, gWindow, "found correct window by window ID");
is(aMessageObject.level, gLevel, "expected level received");
@ -90,7 +90,7 @@ function startGroupTest() {
}
function testConsoleGroup(aMessageObject) {
let messageWindow = getWindowByWindowId(aMessageObject.ID);
let messageWindow = Services.wm.getOuterWindowWithId(aMessageObject.ID);
is(messageWindow, gWindow, "found correct window by window ID");
ok(aMessageObject.level == "group" ||
@ -271,7 +271,7 @@ function startTimeTest() {
}
function testConsoleTime(aMessageObject) {
let messageWindow = getWindowByWindowId(aMessageObject.ID);
let messageWindow = Services.wm.getOuterWindowWithId(aMessageObject.ID);
is(messageWindow, gWindow, "found correct window by window ID");
is(aMessageObject.level, gLevel, "expected level received");
@ -314,7 +314,7 @@ function startTimeEndTest() {
}
function testConsoleTimeEnd(aMessageObject) {
let messageWindow = getWindowByWindowId(aMessageObject.ID);
let messageWindow = Services.wm.getOuterWindowWithId(aMessageObject.ID);
is(messageWindow, gWindow, "found correct window by window ID");
is(aMessageObject.level, gLevel, "expected level received");
@ -354,7 +354,7 @@ function startEmptyTimerTest() {
}
function testEmptyTimer(aMessageObject) {
let messageWindow = getWindowByWindowId(aMessageObject.ID);
let messageWindow = Services.wm.getOuterWindowWithId(aMessageObject.ID);
is(messageWindow, gWindow, "found correct window by window ID");
ok(aMessageObject.level == "time" || aMessageObject.level == "timeEnd",
@ -398,13 +398,3 @@ function getWindowId(aWindow)
.getInterface(Ci.nsIDOMWindowUtils)
.outerWindowID;
}
function getWindowByWindowId(aId) {
let someWindow = Services.wm.getMostRecentWindow("navigator:browser");
if (someWindow) {
let windowUtils = someWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
return windowUtils.getOuterWindowWithId(aId);
}
return null;
}