<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281632] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281632">281632</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-08-26 10:04:05 -0700 (Thu, 26 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/281516">r281516</a>): [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 <a href="http://trac.webkit.org/projects/webkit/changeset/281516">r281516</a> 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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePageh">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281631 => 281632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/LayoutTests/ChangeLog 2021-08-26 17:04:05 UTC (rev 281632)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-08-26  Chris Dumez  <cdumez@apple.com>
+
+        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:
+
</ins><span class="cx"> 2021-08-26  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r281616.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (281631 => 281632)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1624,8 +1624,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/229523 [ Debug ] fast/canvas/webgl/lose-context-on-timeout.html [ Pass Timeout ]
</span><span class="cx"> 
</span><del>-webkit.org/b/229532 fast/loader/reload-zero-byte-plugin.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/229561 http/tests/navigation/page-cache-video.html [ Pass Failure ]
</span><span class="cx"> 
</span><span class="cx"> # rdar://82002352 ([ Monterey wk2 Release ] css3/blending/background-blend-mode-background-clip-content-box.html is flaky image failing)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281631 => 281632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-08-26 16:55:04 UTC (rev 281631)
+++ trunk/Tools/ChangeLog       2021-08-26 17:04:05 UTC (rev 281632)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-08-26  Chris Dumez  <cdumez@apple.com>
+
+        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):
+
</ins><span class="cx"> 2021-08-26  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [run-webkit-tests] Use Python 3 (Part 2)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (281631 => 281632)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -634,11 +634,6 @@
</span><span class="cx">     if (!injectedBundle.isTestRunning())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    // 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;
-
</del><span class="cx">     if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks()) {
</span><span class="cx">         dumpLoadEvent(frame, "didFailProvisionalLoadWithError");
</span><span class="cx">         auto code = WKErrorGetErrorCode(error);
</span><span class="lines">@@ -657,9 +652,6 @@
</span><span class="cx">     if (!injectedBundle.isTestRunning())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (WKBundleFrameIsMainFrame(frame))
-        m_didCommitLoadForMainFrame = true;
-
</del><span class="cx">     if (!injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePageh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h (281631 => 281632)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -180,7 +180,6 @@
</span><span class="cx"> 
</span><span class="cx">     WKBundlePageRef m_page;
</span><span class="cx">     WKRetainPtr<WKBundleScriptWorldRef> m_world;
</span><del>-    bool m_didCommitLoadForMainFrame { false };
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WTR
</span></span></pre>
</div>
</div>

</body>
</html>