Layout Test displaylists/extent-includes-transforms.html is flaky on mac-wk1
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Jan 2016 20:39:27 +0000 (20:39 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Jan 2016 20:39:27 +0000 (20:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153308

Reviewed by Dan Bernstein.

Rather than assuming that a zero-delay timer will fire after the next layer flush,
force a flush with testRunner.display(), which fixes flakiness.

* displaylists/resources/dump-target-display-list.js:
(doTest):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195514 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/displaylists/resources/dump-target-display-list.js

index 470c3ea..f002ef5 100644 (file)
@@ -1,3 +1,16 @@
+2016-01-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Layout Test displaylists/extent-includes-transforms.html is flaky on mac-wk1
+        https://bugs.webkit.org/show_bug.cgi?id=153308
+
+        Reviewed by Dan Bernstein.
+
+        Rather than assuming that a zero-delay timer will fire after the next layer flush,
+        force a flush with testRunner.display(), which fixes flakiness.
+
+        * displaylists/resources/dump-target-display-list.js:
+        (doTest):
+
 2016-01-23  Wonchul Lee  <wonchul.lee@collabora.co.uk>
 
         [GTK] Fix media controls displaying without controls attribute
 2016-01-23  Wonchul Lee  <wonchul.lee@collabora.co.uk>
 
         [GTK] Fix media controls displaying without controls attribute
index df11314..28d999d 100644 (file)
@@ -1,7 +1,5 @@
-if (window.testRunner) {
+if (window.testRunner)
     testRunner.dumpAsText();
     testRunner.dumpAsText();
-    testRunner.waitUntilDone();
-}
 
 var targetDiv;
 function doTest()
 
 var targetDiv;
 function doTest()
@@ -11,13 +9,12 @@ function doTest()
     if (window.internals)
         internals.setElementUsesDisplayListDrawing(targetDiv, true);
     
     if (window.internals)
         internals.setElementUsesDisplayListDrawing(targetDiv, true);
     
-    window.setTimeout(function() {
-        if (window.internals) {
-            var displayList = internals.displayListForElement(targetDiv);
-            document.getElementById('output').textContent = displayList;
-        }
-        if (window.testRunner)
-            testRunner.notifyDone();
-    }, 0);
+    if (window.testRunner)
+        testRunner.display();
+
+    if (window.internals) {
+        var displayList = internals.displayListForElement(targetDiv);
+        document.getElementById('output').textContent = displayList;
+    }
 }
 window.addEventListener('load', doTest, false);
 }
 window.addEventListener('load', doTest, false);