<!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>[200235] 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/200235">200235</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-04-29 01:15:10 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FetchResponse should return a ReadableStream even if disturbed
https://bugs.webkit.org/show_bug.cgi?id=156911
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/response/response-stream-disturbed-5-expected.txt: Rebasing test.
Source/WebCore:
Covered by rebased test.
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::createReadableStreamSource): Asserting in case response is disturbed.
* bindings/js/JSFetchResponseCustom.cpp:
(WebCore::JSFetchResponse::body): Creating a locked empty readable stream if response is disturbed.
* bindings/js/ReadableStreamController.cpp:
(WebCore::createReadableStream): Constructing a readable stream even if source is null.
(WebCore::getReadableStreamReader): Retrieving the reader from a readable stream. Stream must not be locked.
* bindings/js/ReadableStreamController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponsestreamdisturbed5expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-5-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="#trunkSourceWebCorebindingsjsJSFetchResponseCustomcpp">trunk/Source/WebCore/bindings/js/JSFetchResponseCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamControllercpp">trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamControllerh">trunk/Source/WebCore/bindings/js/ReadableStreamController.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 (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ FetchResponse should return a ReadableStream even if disturbed
+ https://bugs.webkit.org/show_bug.cgi?id=156911
+
+ Reviewed by Darin Adler.
+
+ * web-platform-tests/fetch/api/response/response-stream-disturbed-5-expected.txt: Rebasing test.
+
</ins><span class="cx"> 2016-04-29 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Import W3C CSS WG tests for shadow DOM
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponsestreamdisturbed5expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-5-expected.txt (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-5-expected.txt 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-stream-disturbed-5-expected.txt 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><del>-FAIL Getting a body reader after consuming as blob assert_not_equals: got disallowed value null
-FAIL Getting a body reader after consuming as text assert_not_equals: got disallowed value null
-FAIL Getting a body reader after consuming as json assert_not_equals: got disallowed value null
-FAIL Getting a body reader after consuming as arrayBuffer assert_not_equals: got disallowed value null
</del><ins>+PASS Getting a body reader after consuming as blob
+PASS Getting a body reader after consuming as text
+PASS Getting a body reader after consuming as json
+PASS Getting a body reader after consuming as arrayBuffer
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/Source/WebCore/ChangeLog 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-04-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ FetchResponse should return a ReadableStream even if disturbed
+ https://bugs.webkit.org/show_bug.cgi?id=156911
+
+ Reviewed by Darin Adler.
+
+ Covered by rebased test.
+
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::createReadableStreamSource): Asserting in case response is disturbed.
+ * bindings/js/JSFetchResponseCustom.cpp:
+ (WebCore::JSFetchResponse::body): Creating a locked empty readable stream if response is disturbed.
+ * bindings/js/ReadableStreamController.cpp:
+ (WebCore::createReadableStream): Constructing a readable stream even if source is null.
+ (WebCore::getReadableStreamReader): Retrieving the reader from a readable stream. Stream must not be locked.
+ * bindings/js/ReadableStreamController.h:
+
</ins><span class="cx"> 2016-04-29 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Move ResourceTiming behind a runtime flag
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -293,7 +293,9 @@
</span><span class="cx"> ReadableStreamSource* FetchResponse::createReadableStreamSource()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_readableStreamSource);
</span><del>- if (body().isEmpty() || isDisturbed())
</del><ins>+ ASSERT(!isDisturbed());
+
+ if (body().isEmpty())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> m_readableStreamSource = adoptRef(*new FetchResponseSource(*this));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFetchResponseCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFetchResponseCustom.cpp (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFetchResponseCustom.cpp 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/Source/WebCore/bindings/js/JSFetchResponseCustom.cpp 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -38,8 +38,18 @@
</span><span class="cx"> JSC::JSValue JSFetchResponse::body(JSC::ExecState& state) const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><del>- if (!m_body)
- m_body.set(state.vm(), this, createReadableStream(state, globalObject(), wrapped().createReadableStreamSource()));
</del><ins>+ if (!m_body) {
+ JSC::JSValue readableStream;
+ if (wrapped().isDisturbed()) {
+ readableStream = createReadableStream(state, globalObject(), nullptr);
+ // Let's get the reader to lock it.
+ getReadableStreamReader(state, readableStream);
+ } else {
+ ReadableStreamSource* source = wrapped().createReadableStreamSource();
+ readableStream = source ? createReadableStream(state, globalObject(), source) : JSC::jsNull();
+ }
+ m_body.set(state.vm(), this, readableStream);
+ }
</ins><span class="cx"> return m_body.get();
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(state);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -86,12 +86,9 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue createReadableStream(JSC::ExecState& state, JSDOMGlobalObject* globalObject, ReadableStreamSource* source)
</span><span class="cx"> {
</span><del>- if (!source)
- return JSC::jsNull();
-
</del><span class="cx"> JSC::JSLockHolder lock(&state);
</span><span class="cx">
</span><del>- JSC::JSValue jsSource = toJS(&state, globalObject, source);
</del><ins>+ JSC::JSValue jsSource = source ? toJS(&state, globalObject, source) : JSC::jsUndefined();
</ins><span class="cx"> JSC::Strong<JSC::Unknown> protect(state.vm(), jsSource);
</span><span class="cx">
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><span class="lines">@@ -106,6 +103,19 @@
</span><span class="cx"> return JSC::construct(&state, constructor, constructType, constructData, arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSC::JSValue getReadableStreamReader(JSC::ExecState& state, JSC::JSValue readableStream)
+{
+ ASSERT(readableStream.isObject());
+
+ JSC::JSValue getReader = readableStream.getObject()->get(&state, JSC::Identifier::fromString(&state, "getReader"));
+ ASSERT(!state.hadException());
+
+ JSC::JSValue reader = callFunction(state, getReader, readableStream, JSC::MarkedArgumentBuffer());
+ ASSERT(!state.hadException());
+
+ return reader;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamController.h (200234 => 200235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamController.h 2016-04-29 08:09:36 UTC (rev 200234)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamController.h 2016-04-29 08:15:10 UTC (rev 200235)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> JSC::JSValue createReadableStream(JSC::ExecState&, JSDOMGlobalObject*, ReadableStreamSource*);
</span><ins>+JSC::JSValue getReadableStreamReader(JSC::ExecState&, JSC::JSValue);
</ins><span class="cx">
</span><span class="cx"> inline JSDOMGlobalObject* ReadableStreamController::globalObject() const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>