<!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>[244910] 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/244910">244910</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-05-03 10:32:25 -0700 (Fri, 03 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>LayoutTest imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=182849
<rdar://problem/50353372>

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

Modernize the test and add an assertion that the body is transmitted after a redirection.

* web-platform-tests/xhr/event-upload-progress-crossorigin.htm:

Source/WebKit:

In case of restarting the load after a redirection, which now happens in case
of following cross origin redirections with same-origin credentials, make sure to
update the request as would do NetworkLoad.
This is in particular important to preserve the request body.

Covered by WPT updated test.

* NetworkProcess/NetworkLoad.cpp:
(WebKit::updateRequest):
(WebKit::NetworkLoad::updateRequestAfterRedirection const):
(WebKit::NetworkLoad::continueWillSendRequest):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::continueWillSendRequest):

LayoutTests:

* platform/mac-wk2/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsxhreventuploadprogresscrossoriginhtm">trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkLoadcpp">trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkLoadh">trunk/Source/WebKit/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/LayoutTests/ChangeLog 2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-05-03  Youenn Fablet  <youenn@apple.com>
+
+        LayoutTest imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=182849
+        <rdar://problem/50353372>
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk2/TestExpectations:
+
</ins><span class="cx"> 2019-05-03  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Record actions performed on WebGL2RenderingContext
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-05-03  Youenn Fablet  <youenn@apple.com>
+
+        LayoutTest imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=182849
+        <rdar://problem/50353372>
+
+        Reviewed by Alex Christensen.
+
+        Modernize the test and add an assertion that the body is transmitted after a redirection.
+
+        * web-platform-tests/xhr/event-upload-progress-crossorigin.htm:
+
</ins><span class="cx"> 2019-05-03  Joonghun Park  <jh718.park@samsung.com>
</span><span class="cx"> 
</span><span class="cx">         Resolve the percentage values of inset properties against proper box.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsxhreventuploadprogresscrossoriginhtm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm      2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm 2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -11,23 +11,42 @@
</span><span class="cx">       redirect = "resources/redirect.py?code=307&location=" + remote;
</span><span class="cx"> 
</span><span class="cx"> [remote, redirect].forEach(url => {
</span><del>-  async_test(test => {
</del><ins>+  promise_test(async test => {
</ins><span class="cx">     const client = new XMLHttpRequest();
</span><del>-    client.upload.onprogress = test.step_func_done()
-    client.onload = test.unreached_func()
-    client.open("POST", url)
-    client.send("On time: " + url)
</del><ins>+
+    const loadFinished = new Promise(resolve => client.onloadend = resolve);
+    const progressReceived = new Promise(resolve => client.upload.onprogress = resolve);
+    const loadReceived = new Promise((resolve, reject) => client.onload = () => { reject("load event received") });
+
+    const body = "On time: " + url;
+    client.open("POST", url);
+    client.send(body);
+
+    await Promise.race([progressReceived, loadReceived]);
+
+    await loadFinished;
+    assert_equals(client.getResponseHeader("X-Request-Data"), body, "test body");
</ins><span class="cx">   }, "Upload events registered on time (" + url + ")");
</span><span class="cx"> });
</span><span class="cx"> 
</span><span class="cx"> [remote, redirect].forEach(url => {
</span><del>-  async_test(test => {
</del><ins>+  promise_test(async test => {
</ins><span class="cx">     const client = new XMLHttpRequest();
</span><del>-    client.onload = test.step_func_done();
</del><ins>+
+    const loadFinished = new Promise(resolve => client.onloadend = resolve);
+    const loadReceived = new Promise(resolve => client.onload = resolve);
+
+    const body = "Too late: " + url;
</ins><span class="cx">     client.open("POST", url);
</span><del>-    client.send("Too late: " + url);
-    client.upload.onloadstart = test.unreached_func(); // registered too late
-    client.upload.onprogress = test.unreached_func(); // registered too late
</del><ins>+    client.send(body);
+
+    const loadstartReceived = new Promise((resolve, reject) => client.upload.onloadstart = () => { reject("loadstart event received") });
+    const progressReceived = new Promise((resolve, reject) => client.upload.onprogress = () => { reject("progress event received") });
+
+    await Promise.race([loadReceived, progressReceived, loadstartReceived]);
+
+    await loadFinished;
+    assert_equals(client.getResponseHeader("X-Request-Data"), body);
</ins><span class="cx">   }, "Upload events registered too late (" + url + ")");
</span><span class="cx"> });
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations      2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -832,8 +832,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/179352 imported/w3c/web-platform-tests/service-workers/service-worker/windowclient-navigate.https.html [ Pass Failure Slow ]
</span><span class="cx"> 
</span><del>-webkit.org/b/182849 imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/183164 fast/dom/Window/window-focus-self.html [ Pass Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/180982 [ Debug ] imported/w3c/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html [ Slow ]
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/Source/WebKit/ChangeLog       2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-05-03  Youenn Fablet  <youenn@apple.com>
+
+        LayoutTest imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=182849
+        <rdar://problem/50353372>
+
+        Reviewed by Alex Christensen.
+
+        In case of restarting the load after a redirection, which now happens in case
+        of following cross origin redirections with same-origin credentials, make sure to
+        update the request as would do NetworkLoad.
+        This is in particular important to preserve the request body.
+
+        Covered by WPT updated test.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::updateRequest):
+        (WebKit::NetworkLoad::updateRequestAfterRedirection const):
+        (WebKit::NetworkLoad::continueWillSendRequest):
+        * NetworkProcess/NetworkLoad.h:
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::continueWillSendRequest):
+
</ins><span class="cx"> 2019-05-03  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r244881.
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp       2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp  2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -90,15 +90,27 @@
</span><span class="cx">         m_task->cancel();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NetworkLoad::continueWillSendRequest(WebCore::ResourceRequest&& newRequest)
</del><ins>+static inline void updateRequest(ResourceRequest& currentRequest, const ResourceRequest& newRequest)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-    m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest.nsURLRequest(HTTPBodyUpdatePolicy::DoNotUpdateHTTPBody));
</del><ins>+    currentRequest.updateFromDelegatePreservingOldProperties(newRequest.nsURLRequest(HTTPBodyUpdatePolicy::DoNotUpdateHTTPBody));
</ins><span class="cx"> #else
</span><span class="cx">     // FIXME: Implement ResourceRequest::updateFromDelegatePreservingOldProperties. See https://bugs.webkit.org/show_bug.cgi?id=126127.
</span><del>-    m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest);
</del><ins>+    currentRequest.updateFromDelegatePreservingOldProperties(newRequest);
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx"> 
</span><ins>+void NetworkLoad::updateRequestAfterRedirection(WebCore::ResourceRequest& newRequest) const
+{
+    ResourceRequest updatedRequest = m_currentRequest;
+    updateRequest(updatedRequest, newRequest);
+    newRequest = WTFMove(updatedRequest);
+}
+
+void NetworkLoad::continueWillSendRequest(WebCore::ResourceRequest&& newRequest)
+{
+    updateRequest(m_currentRequest, newRequest);
+
</ins><span class="cx">     auto redirectCompletionHandler = std::exchange(m_redirectCompletionHandler, nullptr);
</span><span class="cx">     ASSERT(redirectCompletionHandler);
</span><span class="cx">     if (m_currentRequest.isNull()) {
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.h (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.h    2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">     bool isAllowedToAskUserForCredentials() const;
</span><span class="cx"> 
</span><span class="cx">     const WebCore::ResourceRequest& currentRequest() const { return m_currentRequest; }
</span><ins>+    void updateRequestAfterRedirection(WebCore::ResourceRequest&) const;
</ins><span class="cx"> 
</span><span class="cx">     const NetworkLoadParameters& parameters() const { return m_parameters; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (244909 => 244910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp     2019-05-03 16:39:05 UTC (rev 244909)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp        2019-05-03 17:32:25 UTC (rev 244910)
</span><span class="lines">@@ -701,6 +701,10 @@
</span><span class="cx"> {
</span><span class="cx">     if (m_shouldRestartLoad) {
</span><span class="cx">         m_shouldRestartLoad = false;
</span><ins>+
+        if (m_networkLoad)
+            m_networkLoad->updateRequestAfterRedirection(newRequest);
+
</ins><span class="cx">         restartNetworkLoad(WTFMove(newRequest));
</span><span class="cx">         return;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>