Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1363428 - Use an iterator for iterating windows, r=ato

Browse Source 
MozReview-Commit-ID: FKsw9EST2H7

--HG--
extra : rebase_source : 87ae70226adf947e4b7990348ba94b277cff11d1
This commit is contained in:
James Graham 2017-05-09 17:49:09 +01:00
parent d090e05ce4
commit a79e689564
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
testing/marionette/driver.js
View File

@ -81,6 +81,18 @@ this.Context.fromString = function (s) {
return null;
};
/**
* Helper function for converting an nsISimpleEnumerator to
* a javascript iterator
* @param{nsISimpleEnumerator} enumerator
* enumerator to convert
*/
function* enumeratorIterator (enumerator) {
while (enumerator.hasMoreElements()) {
yield enumerator.getNext();
}
}
/**
* Implements (parts of) the W3C WebDriver protocol. GeckoDriver lives
* in chrome space and mediates calls to the message listener of the current
@ -185,13 +197,17 @@ Object.defineProperty(GeckoDriver.prototype, "timeouts", {
},
});
Object.defineProperty(GeckoDriver.prototype, "windows", {
get: function () {
return enumeratorIterator(Services.wm.getEnumerator(null));
}
});
Object.defineProperty(GeckoDriver.prototype, "windowHandles", {
get: function () {
let hs = [];
let winEn = Services.wm.getEnumerator(null);
while (winEn.hasMoreElements()) {
let win = winEn.getNext();
for (let win of this.windows) {
let tabBrowser = browser.getTabBrowser(win);
// Only return handles for browser windows
@ -212,10 +228,9 @@ Object.defineProperty(GeckoDriver.prototype, "windowHandles", {
Object.defineProperty(GeckoDriver.prototype, "chromeWindowHandles", {
get: function () {
let hs = [];
let winEn = Services.wm.getEnumerator(null);
while (winEn.hasMoreElements()) {
hs.push(getOuterWindowId(winEn.getNext()));
for (let win of this.windows) {
hs.push(getOuterWindowId(win));
}
return hs;
@ -2488,9 +2503,8 @@ GeckoDriver.prototype.close = function (cmd, resp) {
let nwins = 0;
let winEn = Services.wm.getEnumerator(null);
while (winEn.hasMoreElements()) {
let win = winEn.getNext();
for (let win of this.windows) {
// For browser windows count the tabs. Otherwise take the window itself.
let tabbrowser = browser.getTabBrowser(win);
if (tabbrowser) {
@ -2528,10 +2542,8 @@ GeckoDriver.prototype.closeChromeWindow = function (cmd, resp) {
let nwins = 0;
let winEn = Services.wm.getEnumerator(null);
while (winEn.hasMoreElements()) {
for (let _ of this.windows) {
nwins++;
winEn.getNext();
}
// If there is only 1 window left, do not close it. Instead return a faked
@ -2566,9 +2578,7 @@ GeckoDriver.prototype.deleteSession = function (cmd, resp) {
}
}
let winEn = Services.wm.getEnumerator(null);
while (winEn.hasMoreElements()) {
let win = winEn.getNext();
for (let win of this.windows) {
if (win.messageManager) {
win.messageManager.removeDelayedFrameScript(FRAME_SCRIPT);
} else {