Title: [185812] trunk/LayoutTests
- Revision
- 185812
- Author
- [email protected]
- Date
- 2015-06-21 09:44:41 -0700 (Sun, 21 Jun 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (185811 => 185812)
--- trunk/LayoutTests/ChangeLog 2015-06-21 16:16:05 UTC (rev 185811)
+++ trunk/LayoutTests/ChangeLog 2015-06-21 16:44:41 UTC (rev 185812)
@@ -1,5 +1,19 @@
2015-06-21 David Kilzer <[email protected]>
+ 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 <[email protected]>
+
REGRESSION (r185809): fast/css-grid-layout/flex-content-sized-columns-resize.html hangs on WK1
Since window.resize() occurs in the same runloop as the load on
Modified: trunk/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html (185811 => 185812)
--- trunk/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html 2015-06-21 16:16:05 UTC (rev 185811)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html 2015-06-21 16:44:41 UTC (rev 185812)
@@ -18,9 +18,7 @@
}
// 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);
}
window._onresize_ = function () {
Modified: trunk/LayoutTests/fast/fixed-layout/fixed-layout.html (185811 => 185812)
--- trunk/LayoutTests/fast/fixed-layout/fixed-layout.html 2015-06-21 16:16:05 UTC (rev 185811)
+++ trunk/LayoutTests/fast/fixed-layout/fixed-layout.html 2015-06-21 16:44:41 UTC (rev 185812)
@@ -6,15 +6,17 @@
return;
}
- // 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);
@@ -25,4 +27,4 @@
<body style="margin: 0;">
<div style="width: 100%; height: 100%; position: absolute; background-color: green;"></div>
<div style="width: 50vw; height: 50vh; position: absolute; background-color: blue;"></div>
-</body>
\ No newline at end of file
+</body>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
