b=796980, fix content/events/test/window_wheel_default_action.html; r=ehsan,orange
authorVladimir Vukicevic <vladimir@pobox.com>
Tue, 02 Oct 2012 12:35:49 -0400
changeset 109395 cf7a9685b8d8c6db111dfff3a375fd5034f7c594
parent 109394 b83159dadf3cdb6e1717593e4b2474f2c3d5d27f
child 109396 e28ab3e5e961333b88f978ceffd7f27c360d19ca
push id23630
push useremorley@mozilla.com
push dateSat, 06 Oct 2012 19:35:27 +0000
treeherdermozilla-central@9f677c2bb33d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan, orange
bugs796980
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=796980, fix content/events/test/window_wheel_default_action.html; r=ehsan,orange
content/events/test/window_wheel_default_action.html
--- a/content/events/test/window_wheel_default_action.html
+++ b/content/events/test/window_wheel_default_action.html
@@ -44,32 +44,38 @@
 <div id="content" style="display: none">
   
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 SimpleTest.waitForFocus(runTests, window);
 
+var winUtils = SpecialPowers.getDOMWindowUtils(window);
+// grab refresh driver
+winUtils.advanceTimeAndRefresh(100);
+
 var gScrollableElement = document.getElementById("scrollable");
 var gScrolledElement = document.getElementById("scrolled");
 var gSpacerForBodyElement = document.getElementById("spacerForBody");
 
 function is()
 {
   window.opener.is.apply(window.opener, arguments);
 }
 
 function ok()
 {
   window.opener.ok.apply(window.opener, arguments);
 }
 
 function hitEventLoop(aFunc, aTimes)
 {
+  winUtils.advanceTimeAndRefresh(100);
+
   if (--aTimes) {
     setTimeout(hitEventLoop, 0, aFunc, aTimes);
   } else {
     setTimeout(aFunc, 20);
   }
 }
 
 function setDeltaMultiplierSettings(aSettings)
@@ -877,16 +883,17 @@ function doTestScroll(aSettings, aCallba
           ok(gScrollableElement.scrollLeft > 1000, description + "not scrolled to right, got " + gScrollableElement.scrollLeft);
         } else {
           is(gScrollableElement.scrollLeft, 1000, description + "scrolled horizontal");
         }
       }
       if (currentTest.cleanup) {
         currentTest.cleanup();
       }
+      winUtils.advanceTimeAndRefresh(100);
       doNextTest();
     }, 10);
   }
   doNextTest();
 }
 
 function doTestZoom(aSettings, aCallback)
 {