<!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>[244515] 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/244515">244515</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-04-22 15:12:03 -0700 (Mon, 22 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cache API should return Abort error in case of putting an aborted fetch
https://bugs.webkit.org/show_bug.cgi?id=196757

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

* web-platform-tests/service-workers/cache-storage/serviceworker/cache-abort.https-expected.txt:
* web-platform-tests/service-workers/cache-storage/window/cache-abort.https-expected.txt:
* web-platform-tests/service-workers/cache-storage/worker/cache-abort.https-expected.txt:

Source/WebCore:

In case of an aborted fetch, call consume callback with an AbortError.
Update the code that handles load cancelling as the loader callback is called.
Covered by rebased tests.

* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::addAbortSteps):
(WebCore::FetchResponse::BodyLoader::didFail):
(WebCore::FetchResponse::BodyLoader::BodyLoader):
(WebCore::FetchResponse::BodyLoader::~BodyLoader):
(WebCore::FetchResponse::stop):
* Modules/fetch/FetchResponse.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsserviceworkerscachestorageserviceworkercacheaborthttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/serviceworker/cache-abort.https-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsserviceworkerscachestoragewindowcacheaborthttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/window/cache-abort.https-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsserviceworkerscachestorageworkercacheaborthttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/worker/cache-abort.https-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-04-22  Youenn Fablet  <youenn@apple.com>
+
+        Cache API should return Abort error in case of putting an aborted fetch
+        https://bugs.webkit.org/show_bug.cgi?id=196757
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/service-workers/cache-storage/serviceworker/cache-abort.https-expected.txt:
+        * web-platform-tests/service-workers/cache-storage/window/cache-abort.https-expected.txt:
+        * web-platform-tests/service-workers/cache-storage/worker/cache-abort.https-expected.txt:
+
</ins><span class="cx"> 2019-04-19  Antoine Quint  <graouts@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Pointer Events WPT] Provide iOS testdriver
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsserviceworkerscachestorageserviceworkercacheaborthttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/serviceworker/cache-abort.https-expected.txt (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/serviceworker/cache-abort.https-expected.txt     2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/serviceworker/cache-abort.https-expected.txt        2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -2,11 +2,11 @@
</span><span class="cx"> PASS Cache Storage: Abort 
</span><span class="cx"> PASS put() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS put() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL put() followed by abort after headers received should reject with AbortError assert_throws: put should reject function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS put() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> PASS add() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS add() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL add() followed by abort after headers received should reject with AbortError assert_throws: add should reject function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS add() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> PASS addAll() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS addAll() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL addAll() followed by abort after headers received should reject with AbortError assert_throws: addAll should reject function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS addAll() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsserviceworkerscachestoragewindowcacheaborthttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/window/cache-abort.https-expected.txt (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/window/cache-abort.https-expected.txt    2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/window/cache-abort.https-expected.txt       2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> 
</span><span class="cx"> PASS put() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS put() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL put() followed by abort after headers received should reject with AbortError assert_throws: put should reject function "function () { throw e }" threw object "TypeError: Load cancelled" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS put() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> PASS add() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS add() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL add() followed by abort after headers received should reject with AbortError assert_throws: add should reject function "function () { throw e }" threw object "TypeError: Load cancelled" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS add() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> PASS addAll() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS addAll() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL addAll() followed by abort after headers received should reject with AbortError assert_throws: addAll should reject function "function () { throw e }" threw object "TypeError: Load cancelled" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS addAll() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsserviceworkerscachestorageworkercacheaborthttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/worker/cache-abort.https-expected.txt (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/worker/cache-abort.https-expected.txt    2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/cache-storage/worker/cache-abort.https-expected.txt       2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> 
</span><span class="cx"> PASS put() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS put() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL put() followed by abort after headers received should reject with AbortError assert_throws: put should reject function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS put() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> PASS add() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS add() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL add() followed by abort after headers received should reject with AbortError assert_throws: add should reject function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS add() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> PASS addAll() on an already-aborted request should reject with AbortError 
</span><span class="cx"> PASS addAll() synchronously followed by abort should reject with AbortError 
</span><del>-FAIL addAll() followed by abort after headers received should reject with AbortError assert_throws: addAll should reject function "function () { throw e }" threw object "TypeError: Type error" that is not a DOMException AbortError: property "code" is equal to undefined, expected 20
</del><ins>+PASS addAll() followed by abort after headers received should reject with AbortError 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/Source/WebCore/ChangeLog      2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2019-04-22  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        Cache API should return Abort error in case of putting an aborted fetch
+        https://bugs.webkit.org/show_bug.cgi?id=196757
+
+        Reviewed by Darin Adler.
+
+        In case of an aborted fetch, call consume callback with an AbortError.
+        Update the code that handles load cancelling as the loader callback is called.
+        Covered by rebased tests.
+
+        * Modules/fetch/FetchResponse.cpp:
+        (WebCore::FetchResponse::addAbortSteps):
+        (WebCore::FetchResponse::BodyLoader::didFail):
+        (WebCore::FetchResponse::BodyLoader::BodyLoader):
+        (WebCore::FetchResponse::BodyLoader::~BodyLoader):
+        (WebCore::FetchResponse::stop):
+        * Modules/fetch/FetchResponse.h:
+
+2019-04-22  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Update libwebrtc logging when WebCore WebRTC logging is updated
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=197166
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp     2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp        2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -201,6 +201,9 @@
</span><span class="cx">         if (m_bodyLoader) {
</span><span class="cx">             if (auto callback = m_bodyLoader->takeNotificationCallback())
</span><span class="cx">                 callback(Exception { AbortError, "Fetch is aborted"_s });
</span><ins>+
+            if (auto callback = m_bodyLoader->takeConsumeDataCallback())
+                callback(Exception { AbortError, "Fetch is aborted"_s });
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (m_readableStreamSource) {
</span><span class="lines">@@ -211,10 +214,8 @@
</span><span class="cx">         if (m_body)
</span><span class="cx">             m_body->loadingFailed(*loadingException());
</span><span class="cx"> 
</span><del>-        if (m_bodyLoader) {
-            m_bodyLoader->stop();
-            m_bodyLoader = WTF::nullopt;
-        }
</del><ins>+        if (auto bodyLoader = WTFMove(m_bodyLoader))
+            bodyLoader->stop();
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -304,7 +305,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // Check whether didFail is called as part of FetchLoader::start.
</span><del>-    if (m_loader->isStarted()) {
</del><ins>+    if (m_loader && m_loader->isStarted()) {
</ins><span class="cx">         Ref<FetchResponse> protector(m_response);
</span><span class="cx">         m_response.m_bodyLoader = WTF::nullopt;
</span><span class="cx">     }
</span><span class="lines">@@ -313,13 +314,12 @@
</span><span class="cx"> FetchResponse::BodyLoader::BodyLoader(FetchResponse& response, NotificationCallback&& responseCallback)
</span><span class="cx">     : m_response(response)
</span><span class="cx">     , m_responseCallback(WTFMove(responseCallback))
</span><ins>+    , m_pendingActivity(m_response.makePendingActivity(m_response))
</ins><span class="cx"> {
</span><del>-    m_response.setPendingActivity(m_response);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FetchResponse::BodyLoader::~BodyLoader()
</span><span class="cx"> {
</span><del>-    m_response.unsetPendingActivity(m_response);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static uint64_t nextOpaqueLoadIdentifier { 0 };
</span><span class="lines">@@ -521,10 +521,8 @@
</span><span class="cx"> {
</span><span class="cx">     RefPtr<FetchResponse> protectedThis(this);
</span><span class="cx">     FetchBodyOwner::stop();
</span><del>-    if (m_bodyLoader) {
-        m_bodyLoader->stop();
-        m_bodyLoader = WTF::nullopt;
-    }
</del><ins>+    if (auto bodyLoader = WTFMove(m_bodyLoader))
+        bodyLoader->stop();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> const char* FetchResponse::activeDOMObjectName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (244514 => 244515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h       2019-04-22 22:11:14 UTC (rev 244514)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h  2019-04-22 22:12:03 UTC (rev 244515)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx">     class BodyLoader final : public FetchLoaderClient {
</span><span class="cx">     public:
</span><span class="cx">         BodyLoader(FetchResponse&, NotificationCallback&&);
</span><ins>+        BodyLoader(BodyLoader&&) = default;
</ins><span class="cx">         ~BodyLoader();
</span><span class="cx"> 
</span><span class="cx">         bool start(ScriptExecutionContext&, const FetchRequest&);
</span><span class="lines">@@ -140,6 +141,7 @@
</span><span class="cx">         RefPtr<SharedBuffer> startStreaming();
</span><span class="cx"> #endif
</span><span class="cx">         NotificationCallback takeNotificationCallback() { return WTFMove(m_responseCallback); }
</span><ins>+        ConsumeDataByChunkCallback takeConsumeDataCallback() { return WTFMove(m_consumeDataCallback); }
</ins><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         // FetchLoaderClient API
</span><span class="lines">@@ -152,6 +154,7 @@
</span><span class="cx">         NotificationCallback m_responseCallback;
</span><span class="cx">         ConsumeDataByChunkCallback m_consumeDataCallback;
</span><span class="cx">         std::unique_ptr<FetchLoader> m_loader;
</span><ins>+        Ref<PendingActivity<FetchResponse>> m_pendingActivity;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     mutable Optional<ResourceResponse> m_filteredResponse;
</span></span></pre>
</div>
</div>

</body>
</html>