Attachment 371095 Details for Bug 197425 – Patch

[patch] Patch

bug-197425-20190531161933.patch (text/plain), 2.14 KB, created by Simon Fraser (smfr) on 2019-05-31 16:19:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-05-31 16:19:34 PDT

Size: 2.14 KB

patch

obsolete

>Subversion Revision: 245990
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 8296b0c57b814c8288a00fd94ed7955df97a81bf..136ad152bb0bd782327e8593e746c1f7e533f988 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-31  Simon Fraser  <simon.fraser@apple.com>
>+
>+        [Mac WK2 Debug] Layout Test scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=197425
>+
>+        Unreviewed test gardening.
>+        
>+        Speculative fix for flakey test; trigger layout inside the subframe.
>+
>+        * scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html:
>+
> 2019-05-31  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         iOS: Main frame should be scrollable when pinch zoomed or software keyboard is up
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html
>index 4bb2d1900056120e450095f4237ccd25f4fd5f91..af651ab988f5fe1448832bc4759f58a4b691e815 100644
>--- a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html
>@@ -11,8 +11,11 @@
>           window.internals.settings.setAsyncFrameScrollingEnabled(true);
>       function doTest()
>       {
>-          if (window.internals)
>-              document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
>+          if (window.internals) {
>+			  subframe.contentWindow.internals.scrollingStateTreeAsText(); // Trigger frame layout.
>+              document.getElementById('scrollingTree').innerText = internals.scrollingStateTreeAsText() + "\n";
>+          }
>+
>           if (window.testRunner)
>               testRunner.notifyDone();
>       }
>@@ -31,7 +34,7 @@
>     </style>
>   </head>
>   <body>
>-    <iframe onload="doTest()" srcdoc="
>+    <iframe id="subframe" onload="doTest()" srcdoc="
>         <div style='width: 300px; height: 400px; background: gray;'></div>">
>     </iframe>
>     <pre id="scrollingTree"></pre>

Actions: View | Formatted Diff | Diff

Attachments on bug 197425: 371095