Bug 754220 - Fix bad merge in 3e03cd357b9f, a=test-only
authorJonathan Griffin <jgriffin@mozilla.com>
Tue, 11 Dec 2012 17:21:20 -0800
changeset 117500 99207d3a7041e81af568624c422449b3ad3c6fc0
parent 117499 a3e25b271de5151f7c5a498c5aef91758acba975
child 117501 d70027322e491770614f0f1154805aca53db74d0
push id1922
push userjgriffin@mozilla.com
push dateWed, 12 Dec 2012 01:22:35 +0000
treeherdermozilla-beta@99207d3a7041 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs754220
milestone18.0
Bug 754220 - Fix bad merge in 3e03cd357b9f, a=test-only
testing/marionette/marionette-listener.js
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -849,28 +849,28 @@ function switchToFrame(msg) {
     if (curWindow.document.readyState == "complete") {
       sendOk(command_id);
       return;
     } 
     else if (curWindow.document.readyState == "interactive" && errorRegex.exec(curWindow.document.baseURI)) {
       sendError("Error loading page", 13, null, command_id);
       return;
     }
-    
+    checkTimer.initWithCallback(checkLoad, 100, Ci.nsITimer.TYPE_ONE_SHOT);
   }
   let foundFrame = null;
   let frames = curWindow.document.getElementsByTagName("iframe");
   //Until Bug 761935 lands, we won't have multiple nested OOP iframes. We will only have one.
   //parWindow will refer to the iframe above the nested OOP frame.
   let parWindow = curWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                      .getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
   if ((msg.json.value == null) && (msg.json.element == null)) {
     curWindow = content;
     curWindow.focus();
-    
+    checkTimer.initWithCallback(checkLoad, 100, Ci.nsITimer.TYPE_ONE_SHOT);
     return;
   }
   if (msg.json.element != undefined) {
     if (elementManager.seenItems[msg.json.element] != undefined) {
       let wantedFrame = elementManager.getKnownElement(msg.json.element, curWindow); //HTMLIFrameElement
       for (let i = 0; i < frames.length; i++) {
         if (frames[i] == wantedFrame) {
           curWindow = frames[i]; 
@@ -1062,17 +1062,17 @@ function getVisibleCookies(location) {
   }
 
   return results;
 }
 
 function getAppCacheStatus(msg) {
   sendResponse({ value: curWindow.applicationCache.status },
                msg.json.command_id);
-}
+} 
 
 // emulator callbacks
 let _emu_cb_id = 0;
 let _emu_cbs = {};
 
 function runEmulatorCmd(cmd, callback) {
   if (callback) {
     _emu_cbs[_emu_cb_id] = callback;