Changeset 231690 in webkit

Timestamp:

May 10, 2018 10:00:23 PM (6 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r227983): fast/dom/adopt-node-crash-2.html is flaky
​https://bugs.webkit.org/show_bug.cgi?id=182589

Reviewed by Wenson Hsieh.

This is a speculative fix for the test since I can't reproduce the flakiness locally. Because r227983 makes
the layout update async, I suspect the focus change which occurs to the keygen having autofocus attribute
isn't updating the layout in time for notifyDone call. Manually update the layout before/after the test.

Also wait for the load event to figure before starting the test since layout, etc... may not be updated
immediately after DOMContentLoaded.

• fast/dom/adopt-node-crash-2.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/adopt-node-crash-2.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-05-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r227983): fast/dom/adopt-node-crash-2.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=182589
+
+        Reviewed by Wenson Hsieh.
+
+        This is a speculative fix for the test since I can't reproduce the flakiness locally. Because r227983 makes
+        the layout update async, I suspect the focus change which occurs to the keygen having autofocus attribute
+        isn't updating the layout in time for notifyDone call. Manually update the layout before/after the test.
+
+        Also wait for the load event to figure before starting the test since layout, etc... may not be updated
+        immediately after DOMContentLoaded.
+
+        * fast/dom/adopt-node-crash-2.html:
+
 2018-05-10  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/fast/dom/adopt-node-crash-2.html

@@ -21 +21 @@
 function doit()
 {
-    div2.addEventListener("DOMFocusOut", function () { document.implementation.createDocument("", "", null).adoptNode(div2); }, false);
+    div2.addEventListener("DOMFocusOut", function () {
+        document.implementation.createDocument("", "", null).adoptNode(div2);
+        setTimeout(() => {
+            if (window.internals)
+                internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+            if (window.testRunner)
+                testRunner.notifyDone();
+        }, 0);
+    }, false);
     div1.outerHTML = header1.outerHTML;
-    if (window.testRunner)
-        testRunner.notifyDone();
 }
-document.addEventListener("DOMContentLoaded", function() {
+window.onload = function() {
+    if (window.internals)
+        internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+    else
+        div2.getBoundingClientRect();
     setTimeout("doit()", 1);
-}, false);
+}
 </script>
 </html>