Changeset 185812 in webkit

Timestamp:

Jun 21, 2015, 9:44:41 AM (11 years ago)

Author:

ddkilzer@apple.com

Message:

fast/fixed-layout/fixed-layout.html times out on Apple WK2 bots

The Flakiness Dashboard says this test times out on Apple
WebKit2 platforms by not calling testRunner.notifyDone():

<​http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=fast%2Ffixed-layout%2Ffixed-layout.html>

• fast/css-grid-layout/flex-content-sized-columns-resize.html:

Use the same mechanism here that was just added in r185811.

• fast/fixed-layout/fixed-layout.html: Switch to using a

zero-delay timer instead of document.body.offsetTop.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/css-grid-layout/flex-content-sized-columns-resize.html (modified) (1 diff)
• fast/fixed-layout/fixed-layout.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-21  David Kilzer  <ddkilzer@apple.com>
+
+        fast/fixed-layout/fixed-layout.html times out on Apple WK2 bots
+
+        The Flakiness Dashboard says this test times out on Apple
+        WebKit2 platforms by not calling testRunner.notifyDone():
+
+        <http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=fast%2Ffixed-layout%2Ffixed-layout.html>
+
+        * fast/css-grid-layout/flex-content-sized-columns-resize.html:
+        Use the same mechanism here that was just added in r185811.
+        * fast/fixed-layout/fixed-layout.html: Switch to using a
+        zero-delay timer instead of document.body.offsetTop.
+
 2015-06-21  David Kilzer  <ddkilzer@apple.com>
 

trunk/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html

@@ -19 +19 @@
 
     // Prevent WebKit1 hangs by ensuring layout is up-to-date before resize.
-    document.body.offsetTop;
-
-    window.resizeTo(600, 600);
+    setTimeout(function() { window.resizeTo(600, 600); }, 0);
 }
 

trunk/LayoutTests/fast/fixed-layout/fixed-layout.html

@@ -7 +7 @@
     }
 
-    // Ensure layout is up to date here so that we get a resize event instead of just using
-    // 200x200 as the initial size, in WebKit1 (causing the test to hang).
-    document.body.offsetTop;
+    testRunner.waitUntilDone();
 
-    testRunner.waitUntilDone();
-    window.resizeTo(200, 200);
+    // Prevent WebKit1 hangs by ensuring layout is up-to-date before resize.
+    setTimeout(function() { window.resizeTo(200, 200); }, 0);
 }
 
 window.onresize = function () {
+    if (!window.testRunner) {
+        return;
+    }
+
     internals.setUseFixedLayout(true);
     internals.setFixedLayoutSize(400, 400);