<!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>[203162] 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/203162">203162</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-13 09:08:51 -0700 (Wed, 13 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Response should not become disturbed on the ReadableStream creation
https://bugs.webkit.org/show_bug.cgi?id=159714
Patch by Youenn Fablet <youenn@apple.com> on 2016-07-13
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/response/response-stream-disturbed-1-expected.txt:
Source/WebCore:
Covered by rebased test and existing tests.
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::stop): Making the response disturbed if cancelled.
* Modules/fetch/FetchResponseSource.cpp:
(WebCore::FetchResponseSource::firstReadCallback): Start enqueueing as soon as first read is made.
(WebCore::FetchResponseSource::doStart): Keep the start promise unresolved so that pull is not called.
FetchResponse is a push source.
* Modules/fetch/FetchResponseSource.h:
* Modules/streams/ReadableStreamInternals.js:
(readFromReadableStreamReader): Calling @firstReadCallback.
* Modules/streams/ReadableStreamSource.h:
(WebCore::ReadableStreamSource::firstReadCallback): Default implementation (does nothing).
* Modules/streams/ReadableStreamSource.idl: Adding firstReadCallback private method.
* bindings/js/WebCoreBuiltinNames.h: Adding @firstReadCallback.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponsestreamdisturbed1expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-1-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>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseSourcecpp">trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseSourceh">trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourceh">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourceidl">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh">trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.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 (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-13 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Response should not become disturbed on the ReadableStream creation
+ https://bugs.webkit.org/show_bug.cgi?id=159714
+
+ Reviewed by Alex Christensen.
+
+ * web-platform-tests/fetch/api/response/response-stream-disturbed-1-expected.txt:
+
</ins><span class="cx"> 2016-07-12 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] isRedirected should be conveyed in workers
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponsestreamdisturbed1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-1-expected.txt (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-1-expected.txt 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-1-expected.txt 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><del>-FAIL Getting blob after getting the Response body - not disturbed, not locked promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Getting text after getting the Response body - not disturbed, not locked promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Getting json after getting the Response body - not disturbed, not locked promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Getting arrayBuffer after getting the Response body - not disturbed, not locked promise_test: Unhandled rejection with value: object "TypeError: Type error"
</del><ins>+PASS Getting blob after getting the Response body - not disturbed, not locked
+PASS Getting text after getting the Response body - not disturbed, not locked
+PASS Getting json after getting the Response body - not disturbed, not locked
+PASS Getting arrayBuffer after getting the Response body - not disturbed, not locked
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/ChangeLog 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-07-13 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Response should not become disturbed on the ReadableStream creation
+ https://bugs.webkit.org/show_bug.cgi?id=159714
+
+ Reviewed by Alex Christensen.
+
+ Covered by rebased test and existing tests.
+
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::stop): Making the response disturbed if cancelled.
+ * Modules/fetch/FetchResponseSource.cpp:
+ (WebCore::FetchResponseSource::firstReadCallback): Start enqueueing as soon as first read is made.
+ (WebCore::FetchResponseSource::doStart): Keep the start promise unresolved so that pull is not called.
+ FetchResponse is a push source.
+ * Modules/fetch/FetchResponseSource.h:
+ * Modules/streams/ReadableStreamInternals.js:
+ (readFromReadableStreamReader): Calling @firstReadCallback.
+ * Modules/streams/ReadableStreamSource.h:
+ (WebCore::ReadableStreamSource::firstReadCallback): Default implementation (does nothing).
+ * Modules/streams/ReadableStreamSource.idl: Adding firstReadCallback private method.
+ * bindings/js/WebCoreBuiltinNames.h: Adding @firstReadCallback.
+
</ins><span class="cx"> 2016-07-13 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][GL] crash within triggerRepaint
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -287,6 +287,13 @@
</span><span class="cx"> ASSERT(m_loader);
</span><span class="cx"> return m_loader->startStreaming();
</span><span class="cx"> }
</span><ins>+
+void FetchResponse::cancel()
+{
+ m_isDisturbed = true;
+ stop();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void FetchResponse::stop()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> ReadableStreamSource* createReadableStreamSource();
</span><span class="cx"> void consumeBodyAsStream();
</span><ins>+ void cancel();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponseSource.cpp 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -55,17 +55,21 @@
</span><span class="cx"> m_response.unsetPendingActivity(&m_response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FetchResponseSource::doStart()
</del><ins>+void FetchResponseSource::firstReadCallback()
</ins><span class="cx"> {
</span><del>- // FIXME: We should consume body only if stream reader requested data, i.e. is disturbed.
- // We might need a callback to be notified of the stream being disturbed.
</del><span class="cx"> m_response.consumeBodyAsStream();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FetchResponseSource::doStart()
+{
+ // startFinished should not be called as this is a push source, hence overriding default implementation.
+}
+
+
</ins><span class="cx"> void FetchResponseSource::doCancel()
</span><span class="cx"> {
</span><span class="cx"> m_isCancelling = true;
</span><del>- static_cast<ActiveDOMObject&>(m_response).stop();
</del><ins>+ m_response.cancel();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchResponseSource::close()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponseSource.h 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef FetchResponseSource_h
-#define FetchResponseSource_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FETCH_API) && ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="lines">@@ -49,6 +48,7 @@
</span><span class="cx"> bool isReadableStreamLocked() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void firstReadCallback() final;
</ins><span class="cx"> void doStart() final;
</span><span class="cx"> void doCancel() final;
</span><span class="cx"> void setActive() final;
</span><span class="lines">@@ -61,5 +61,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FETCH_API) && ENABLE(STREAMS_API)
</span><del>-
-#endif // FetchResponseSource_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -341,6 +341,11 @@
</span><span class="cx">
</span><span class="cx"> const stream = reader.@ownerReadableStream;
</span><span class="cx"> @assert(!!stream);
</span><ins>+
+ // Native sources may want to start enqueueing at the time of the first read request.
+ if (!stream.@disturbed && stream.@underlyingSource.@firstReadCallback)
+ stream.@underlyingSource.@firstReadCallback();
+
</ins><span class="cx"> stream.@disturbed = true;
</span><span class="cx"> if (stream.@state === @streamClosed)
</span><span class="cx"> return @Promise.@resolve({value: @undefined, done: true});
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -26,10 +26,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#pragma once
</ins><span class="cx">
</span><del>-#ifndef ReadableStreamSource_h
-#define ReadableStreamSource_h
-
</del><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> #include "JSDOMPromise.h"
</span><span class="lines">@@ -46,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> typedef DOMPromise<std::nullptr_t> Promise;
</span><span class="cx">
</span><ins>+ virtual void firstReadCallback() { }
</ins><span class="cx"> void start(ReadableStreamController&&, Promise&&);
</span><span class="cx"> void cancel(JSC::JSValue);
</span><span class="cx">
</span><span class="lines">@@ -103,5 +102,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><del>-
-#endif // ReadableStreamSource_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.idl 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> [Custom] Promise start(ReadableStreamController controller);
</span><span class="cx"> void cancel(any reason);
</span><span class="cx">
</span><ins>+ [PrivateIdentifier] void firstReadCallback();
+
</ins><span class="cx"> // Place holder to keep the controller linked to the source.
</span><span class="cx"> [CachedAttribute, CustomGetter] readonly attribute any controller;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (203161 => 203162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-07-13 14:48:09 UTC (rev 203161)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-07-13 16:08:51 UTC (rev 203162)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> macro(controller) \
</span><span class="cx"> macro(disturbed) \
</span><span class="cx"> macro(fillFromJS) \
</span><ins>+ macro(firstReadCallback) \
</ins><span class="cx"> macro(getUserMediaFromJS) \
</span><span class="cx"> macro(getRemoteStreams) \
</span><span class="cx"> macro(getSenders) \
</span></span></pre>
</div>
</div>
</body>
</html>