Title: [281632] trunk
Revision
281632
Author
[email protected]
Date
2021-08-26 10:04:05 -0700 (Thu, 26 Aug 2021)

Log Message

REGRESSION (r281516): [AppleSilicon WK2] fast/loader/reload-zero-byte-plugin.html is timing out
https://bugs.webkit.org/show_bug.cgi?id=229532
<rdar://problem/82370692>

Tools:

Unreviewed, partial revert of r281516 to drop the changes to WebKitTestRunner's injected bundle
as I suspect this is what caused this regression. The WKTR changes were made to try and address
the flakiness of imported/w3c/web-platform-tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html
but it turns out that the test is still flaky with the WKTR change.

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame):

LayoutTests:

Unreviewed, unskip test that should not longer be timing out.

* platform/mac-wk2/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (281631 => 281632)


--- trunk/LayoutTests/ChangeLog	2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/LayoutTests/ChangeLog	2021-08-26 17:04:05 UTC (rev 281632)
@@ -1,3 +1,13 @@
+2021-08-26  Chris Dumez  <[email protected]>
+
+        REGRESSION (r281516): [AppleSilicon WK2] fast/loader/reload-zero-byte-plugin.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=229532
+        <rdar://problem/82370692>
+
+        Unreviewed, unskip test that should not longer be timing out.
+
+        * platform/mac-wk2/TestExpectations:
+
 2021-08-26  Commit Queue  <[email protected]>
 
         Unreviewed, reverting r281616.

Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (281631 => 281632)


--- trunk/LayoutTests/platform/mac-wk2/TestExpectations	2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations	2021-08-26 17:04:05 UTC (rev 281632)
@@ -1624,8 +1624,6 @@
 
 webkit.org/b/229523 [ Debug ] fast/canvas/webgl/lose-context-on-timeout.html [ Pass Timeout ]
 
-webkit.org/b/229532 fast/loader/reload-zero-byte-plugin.html [ Skip ]
-
 webkit.org/b/229561 http/tests/navigation/page-cache-video.html [ Pass Failure ]
 
 # rdar://82002352 ([ Monterey wk2 Release ] css3/blending/background-blend-mode-background-clip-content-box.html is flaky image failing)

Modified: trunk/Tools/ChangeLog (281631 => 281632)


--- trunk/Tools/ChangeLog	2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/Tools/ChangeLog	2021-08-26 17:04:05 UTC (rev 281632)
@@ -1,3 +1,17 @@
+2021-08-26  Chris Dumez  <[email protected]>
+
+        REGRESSION (r281516): [AppleSilicon WK2] fast/loader/reload-zero-byte-plugin.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=229532
+        <rdar://problem/82370692>
+
+        Unreviewed, partial revert of r281516 to drop the changes to WebKitTestRunner's injected bundle
+        as I suspect this is what caused this regression. The WKTR changes were made to try and address
+        the flakiness of imported/w3c/web-platform-tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html
+        but it turns out that the test is still flaky with the WKTR change.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame):
+
 2021-08-26  Jonathan Bedard  <[email protected]>
 
         [run-webkit-tests] Use Python 3 (Part 2)

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (281631 => 281632)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2021-08-26 17:04:05 UTC (rev 281632)
@@ -634,11 +634,6 @@
     if (!injectedBundle.isTestRunning())
         return;
 
-    // When process swapping on resource response, the previous process's load gets interrupted by policy decision
-    // but we don't want to interrupt the test.
-    if (WKErrorGetErrorCode(error) == kWKErrorCodeFrameLoadInterruptedByPolicyChange && WKBundleFrameIsMainFrame(frame) && !m_didCommitLoadForMainFrame)
-        return;
-
     if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks()) {
         dumpLoadEvent(frame, "didFailProvisionalLoadWithError");
         auto code = WKErrorGetErrorCode(error);
@@ -657,9 +652,6 @@
     if (!injectedBundle.isTestRunning())
         return;
 
-    if (WKBundleFrameIsMainFrame(frame))
-        m_didCommitLoadForMainFrame = true;
-
     if (!injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
         return;
 

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h (281631 => 281632)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h	2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h	2021-08-26 17:04:05 UTC (rev 281632)
@@ -180,7 +180,6 @@
 
     WKBundlePageRef m_page;
     WKRetainPtr<WKBundleScriptWorldRef> m_world;
-    bool m_didCommitLoadForMainFrame { false };
 };
 
 } // namespace WTR
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to