Bug 1210117 - Flush paints before running the test body in test_scroll_inactive_flattened_frame.html. r=kats draft
authorBotond Ballo <botond@mozilla.com>
Mon, 07 Mar 2016 20:40:37 -0500
changeset 337574 c9dad54a151e2a67809d719be74924fa23e15e2e
parent 337411 be593a64d7c6a826260514fe758ef32a6ee580f7
child 515700 c7d40a5b000b7b13edcfa68390f82f56924330fa
push id12401
push userbballo@mozilla.com
push dateTue, 08 Mar 2016 01:41:12 +0000
reviewerskats
bugs1210117
milestone48.0a1
Bug 1210117 - Flush paints before running the test body in test_scroll_inactive_flattened_frame.html. r=kats MozReview-Commit-ID: DQKdb20o4XM
gfx/layers/apz/test/mochitest/test_scroll_inactive_flattened_frame.html
--- a/gfx/layers/apz/test/mochitest/test_scroll_inactive_flattened_frame.html
+++ b/gfx/layers/apz/test/mochitest/test_scroll_inactive_flattened_frame.html
@@ -1,15 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test scrolling flattened inactive frames</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/paint_listener.js"></script>
+  <script type="application/javascript" src="apz_test_utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <div id="container" style="height: 300px; width: 600px; overflow: auto; background: yellow">
  <div id="outer" style="height: 400px; width: 500px; overflow: auto; background: black">
   <div id="inner" style="mix-blend-mode: screen; height: 800px; overflow: auto; background: purple">
   </div>
  </div>
@@ -30,22 +31,28 @@ function test() {
   };
   sendWheelAndPaint(inner, 20, 30, event, function () {
     ok(container.scrollTop == containerScrollTop, "container scrollframe should not have scrolled");
     ok(outer.scrollTop > outerScrollTop, "nested scrollframe should have scrolled");
     SimpleTest.finish();
   });
 }
 
+function startTest() {
+  waitForAllPaints(function() {
+    flushApzRepaints(test);
+  });
+}
+
 window.onload = function() {
   SpecialPowers.pushPrefEnv({
     'set': [['general.smoothScroll', false],
             ['mousewheel.transaction.timeout', 1000000]],
   }, function () {
-    SimpleTest.waitForFocus(test);
+    SimpleTest.waitForFocus(startTest);
   });
 }
 
 SimpleTest.testInChaosMode();
 SimpleTest.waitForExplicitFinish();
 </script>
 </body>
 </html>