Title: [218779] trunk/LayoutTests
- Revision
- 218779
- Author
- [email protected]
- Date
- 2017-06-23 18:56:51 -0700 (Fri, 23 Jun 2017)
Log Message
fast/events/page-visibility-iframe-delete-test.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=173798
Reviewed by Simon Fraser.
Modernize the test and deflake it by not making it rely on a specific order
for the visibilitychange events. The event queues are per documents and there
is therefore no guarantee those events will fire in frame tree order.
* fast/events/page-visibility-iframe-delete-test-expected.txt:
* fast/events/page-visibility-iframe-delete-test.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (218778 => 218779)
--- trunk/LayoutTests/ChangeLog 2017-06-24 01:25:54 UTC (rev 218778)
+++ trunk/LayoutTests/ChangeLog 2017-06-24 01:56:51 UTC (rev 218779)
@@ -1,3 +1,17 @@
+2017-06-23 Chris Dumez <[email protected]>
+
+ fast/events/page-visibility-iframe-delete-test.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=173798
+
+ Reviewed by Simon Fraser.
+
+ Modernize the test and deflake it by not making it rely on a specific order
+ for the visibilitychange events. The event queues are per documents and there
+ is therefore no guarantee those events will fire in frame tree order.
+
+ * fast/events/page-visibility-iframe-delete-test-expected.txt:
+ * fast/events/page-visibility-iframe-delete-test.html:
+
2017-06-23 Youenn Fablet <[email protected]>
Add a binary data channel webrtc test
Modified: trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt (218778 => 218779)
--- trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt 2017-06-24 01:25:54 UTC (rev 218778)
+++ trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test-expected.txt 2017-06-24 01:56:51 UTC (rev 218779)
@@ -4,8 +4,8 @@
Loaded all frames.
-Visibility of main document changed.
-Visibility of sub frame 2 changed.
+Received visibilitychange event
+Received visibilitychange event
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html (218778 => 218779)
--- trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html 2017-06-24 01:25:54 UTC (rev 218778)
+++ trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html 2017-06-24 01:56:51 UTC (rev 218779)
@@ -1,28 +1,14 @@
+<!DOCTYPE html>
<html>
-<body _onload_="startTest()">
-
-<script src=""
-
+<body>
+<script src=""
<script>
-
description("This test checks that the page visibility event propagation does not crash the browser when frames are added / deleted.");
+jsTestIsAsync = true;
-var jsTestIsAsync = true;
+let visibilityChangeEventCount = 0;
-var numVisibilityChanges = 0;
-var frame1, frame2, frame3, frame4, frame5, subframe1, subFrame2, subFrame3;
-
-var docsLoaded = 0;
-var mainPageVisibilityChangeDone = false;
-var frame2VisiblityChangeDone = false;
-var finishTestDone = false;
-
-function startTest() {
- ++docsLoaded;
- if (docsLoaded < 8) {
- return;
- }
-
+_onload_ = function() {
debug("Loaded all frames.");
frame1 = document.getElementById("topFrame1");
@@ -32,81 +18,53 @@
subFrame1 = frame3.contentDocument.getElementById("subIframe1");
subFrame2 = frame3.contentDocument.getElementById("subIframe2");
- document.addEventListener(
- "visibilitychange", onMainPageVisibilityChange, false);
- frame2.contentDocument.addEventListener(
- "visibilitychange", onFrame2VisibilityChange, false);
+ document.addEventListener("visibilitychange", onMainPageVisibilityChange);
+ frame2.contentDocument.addEventListener("visibilitychange", onFrame2VisibilityChange);
+
// Change the visibility of the current page to invisible.
- if (window.testRunner) {
- numVisibilityChanges++;
+ if (window.testRunner)
testRunner.setPageVisibility("hidden");
- }
}
-function finishTest() {
- document.removeEventListener(
- "visibilitychange", onMainPageVisibilityChange, false);
- frame2.contentDocument.removeEventListener(
- "visibilitychange", onFrame2VisibilityChange, false);
+function onMainPageVisibilityChange()
+{
+ ++visibilityChangeEventCount;
+ debug("Received visibilitychange event");
- if (window.testRunner)
- testRunner.resetPageVisibility();
- finishJSTest();
-}
+ // Delete frame 4.
+ frame4.remove();
-function onMainPageVisibilityChange() {
- if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
- finishTest();
- } else if (!mainPageVisibilityChangeDone) {
- debug("Visibility of main document changed.");
- // Delete frame 4.
- document.body.removeChild(frame4);
-
// Delete subframe 2.
- frame3.contentDocument.body.removeChild(subFrame2);
+ frame3.contentDocument.body.removeChild(subFrame2);
- // Add a new frame to top level.
- frame5 = document.createElement("iframe");
- frame5.src = '';
- document.body.appendChild(frame5);
+ // Add a new frame to top level.
+ frame5 = document.createElement("iframe");
+ document.body.appendChild(frame5);
- // Add a new frame to frame2.
- subFrame3 = frame2.contentDocument.createElement("iframe");
- subFrame3.src = '';
- frame2.contentDocument.body.appendChild(subFrame3);
+ // Add a new frame to frame2.
+ subFrame3 = frame2.contentDocument.createElement("iframe");
+ frame2.contentDocument.body.appendChild(subFrame3);
- mainPageVisibilityChangeDone = true;
- }
-
- if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
- finishTest();
- }
+ if (visibilityChangeEventCount == 2)
+ finishJSTest();
}
-function onFrame2VisibilityChange() {
- if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
- finishTest();
- } else if (!frame2VisiblityChangeDone) {
- debug("Visibility of sub frame 2 changed.");
+function onFrame2VisibilityChange()
+{
+ ++visibilityChangeEventCount;
+ debug("Received visibilitychange event");
- // Delete frame 1.
- document.body.removeChild(frame1);
+ // Delete frame 1.
+ frame1.remove();
- frame2VisiblityChangeDone = true;
- }
-
- if (mainPageVisibilityChangeDone && frame2VisiblityChangeDone) {
- finishTest();
- }
+ if (visibilityChangeEventCount == 2)
+ finishJSTest();
}
</script>
-
-<script src=""
-
-<iframe id="topFrame1" _onload_="startTest()" ></iframe>
-<iframe id="topFrame2" _onload_="startTest()" ></iframe>
-<iframe id="topFrame3" _onload_="startTest()" src=""
-<iframe id="topFrame4" _onload_="startTest()" ></iframe>
+<iframe id="topFrame1"></iframe>
+<iframe id="topFrame2"></iframe>
+<iframe id="topFrame3" src=""
+<iframe id="topFrame4"></iframe>
</body>
</html>
Modified: trunk/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html (218778 => 218779)
--- trunk/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html 2017-06-24 01:25:54 UTC (rev 218778)
+++ trunk/LayoutTests/fast/events/resources/page-visibility-iframe-delete-test-frame.html 2017-06-24 01:56:51 UTC (rev 218779)
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
<html>
-<body _onload_="parent.startTest()">
-<iframe id="subIframe1" _onload_="parent.parent.startTest()"></iframe>
-<iframe id="subIframe2" _onload_="parent.parent.startTest()"></iframe>
+<body>
+<iframe id="subIframe1"></iframe>
+<iframe id="subIframe2"></iframe>
</body>
</html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
