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

Bug 753273 - Wait for window and browser at the start of newSession, r=mdas, a=test-only, DONTBUILD because NPOTB

Browse Source
This commit is contained in:
Jonathan Griffin 2012-05-10 11:42:54 -07:00
parent e57041ba5c
commit e073e78092
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testing/marionette/marionette-actors.js
View File

@ -336,8 +336,21 @@ MarionetteDriverActor.prototype = {
*
*/
newSession: function MDA_newSession() {
function waitForWindow() {
let checkTimer = Cc["@mozilla.org/timer;1"].
createInstance(Ci.nsITimer);
let win = this.getCurrentWindow();
if (!win || (appName != "B2G" && !win.gBrowser)) {
checkTimer.initWithCallback(waitForWindow.bind(this), 100, Ci.nsITimer.TYPE_ONE_SHOT);
}
else {
this.startBrowser(win, true);
}
}
if (!prefs.getBoolPref("marionette.contentListener")) {
this.startBrowser(this.getCurrentWindow(), true);
waitForWindow.call(this);
}
else if ((appName == "B2G") && (this.curBrowser == null)) {
//if there is a content listener, then we just wake it up