<!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>[203411] 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/203411">203411</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-19 10:27:32 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] ReadableStreamController methods should throw if its stream is not readable
https://bugs.webkit.org/show_bug.cgi?id=159871
Patch by Youenn Fablet <youenn@apple.com> on 2016-07-19
Reviewed by Xabier Rodriguez-Calvar.
LayoutTests/imported/w3c:
* web-platform-tests/streams/readable-streams/bad-underlying-sources.https-expected.txt:
Source/WebCore:
Spec now mandates close and enqueue to throw if ReadableStream is not readable.
Covered by rebased and/or modified tests.
* Modules/streams/ReadableStreamController.js:
(enqueue): Throwing a TypeError if controlled stream is not readable.
(close): Ditto.
LayoutTests:
* streams/reference-implementation/pipe-to-options.html: Updated test case according whatwg original test.
* streams/reference-implementation/readable-stream-templated.html: Ditto.</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="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablestreamsbadunderlyingsourceshttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/bad-underlying-sources.https-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationpipetooptionshtml">trunk/LayoutTests/streams/reference-implementation/pipe-to-options.html</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedhtml">trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamControllerjs">trunk/Source/WebCore/Modules/streams/ReadableStreamController.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/LayoutTests/ChangeLog 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-19 Youenn Fablet <youenn@apple.com>
+
+ [Streams API] ReadableStreamController methods should throw if its stream is not readable
+ https://bugs.webkit.org/show_bug.cgi?id=159871
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * streams/reference-implementation/pipe-to-options.html: Updated test case according whatwg original test.
+ * streams/reference-implementation/readable-stream-templated.html: Ditto.
+
</ins><span class="cx"> 2016-07-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Bubbles appear split for a brief moment in Messages
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-19 Youenn Fablet <youenn@apple.com>
+
+ [Streams API] ReadableStreamController methods should throw if its stream is not readable
+ https://bugs.webkit.org/show_bug.cgi?id=159871
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * web-platform-tests/streams/readable-streams/bad-underlying-sources.https-expected.txt:
+
</ins><span class="cx"> 2016-07-19 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Refresh WPT tests up to 98ec1ad
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablestreamsbadunderlyingsourceshttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/bad-underlying-sources.https-expected.txt (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/bad-underlying-sources.https-expected.txt 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/bad-underlying-sources.https-expected.txt 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -7,14 +7,14 @@
</span><span class="cx"> PASS Underlying source pull: throwing method (second pull)
</span><span class="cx"> PASS Underlying source cancel: throwing getter
</span><span class="cx"> PASS Underlying source cancel: throwing method
</span><del>-FAIL Underlying source: calling enqueue on an empty canceled stream should throw assert_throws: Calling enqueue after canceling should throw function "() => controller.enqueue('a')" did not throw
-FAIL Underlying source: calling enqueue on a non-empty canceled stream should throw assert_throws: Calling enqueue after canceling should throw function "() => controller.enqueue('c')" did not throw
</del><ins>+PASS Underlying source: calling enqueue on an empty canceled stream should throw
+PASS Underlying source: calling enqueue on a non-empty canceled stream should throw
</ins><span class="cx"> PASS Underlying source: calling enqueue on a closed stream should throw
</span><del>-FAIL Underlying source: calling enqueue on an errored stream should throw assert_throws: call to enqueue should throw the error function "() => c.enqueue('a')" threw object "Error: boo" ("Error") expected object "TypeError" ("TypeError")
</del><ins>+PASS Underlying source: calling enqueue on an errored stream should throw
</ins><span class="cx"> PASS Underlying source: calling close twice on an empty stream should throw the second time
</span><span class="cx"> PASS Underlying source: calling close twice on a non-empty stream should throw the second time
</span><del>-FAIL Underlying source: calling close on an empty canceled stream should throw assert_throws: Calling close after canceling should throw function "() => controller.close()" did not throw
-FAIL Underlying source: calling close on a non-empty canceled stream should throw assert_throws: Calling close after canceling should throw function "() => controller.close()" did not throw
</del><ins>+PASS Underlying source: calling close on an empty canceled stream should throw
+PASS Underlying source: calling close on a non-empty canceled stream should throw
</ins><span class="cx"> PASS Underlying source: calling close after error should throw
</span><span class="cx"> PASS Underlying source: calling error twice should throw the second time
</span><span class="cx"> PASS Underlying source: calling error after close should throw
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx"> PASS Underlying source pull: throwing method (second pull)
</span><span class="cx"> PASS Underlying source cancel: throwing getter
</span><span class="cx"> PASS Underlying source cancel: throwing method
</span><del>-FAIL Underlying source: calling enqueue on an empty canceled stream should throw assert_throws: Calling enqueue after canceling should throw function "() => controller.enqueue('a')" did not throw
-FAIL Underlying source: calling enqueue on a non-empty canceled stream should throw assert_throws: Calling enqueue after canceling should throw function "() => controller.enqueue('c')" did not throw
</del><ins>+PASS Underlying source: calling enqueue on an empty canceled stream should throw
+PASS Underlying source: calling enqueue on a non-empty canceled stream should throw
</ins><span class="cx"> PASS Underlying source: calling enqueue on a closed stream should throw
</span><del>-FAIL Underlying source: calling enqueue on an errored stream should throw assert_throws: call to enqueue should throw the error function "() => c.enqueue('a')" threw object "Error: boo" ("Error") expected object "TypeError" ("TypeError")
</del><ins>+PASS Underlying source: calling enqueue on an errored stream should throw
</ins><span class="cx"> PASS Underlying source: calling close twice on an empty stream should throw the second time
</span><span class="cx"> PASS Underlying source: calling close twice on a non-empty stream should throw the second time
</span><del>-FAIL Underlying source: calling close on an empty canceled stream should throw assert_throws: Calling close after canceling should throw function "() => controller.close()" did not throw
-FAIL Underlying source: calling close on a non-empty canceled stream should throw assert_throws: Calling close after canceling should throw function "() => controller.close()" did not throw
</del><ins>+PASS Underlying source: calling close on an empty canceled stream should throw
+PASS Underlying source: calling close on a non-empty canceled stream should throw
</ins><span class="cx"> PASS Underlying source: calling close after error should throw
</span><span class="cx"> PASS Underlying source: calling error twice should throw the second time
</span><span class="cx"> PASS Underlying source: calling error after close should throw
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationpipetooptionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/pipe-to-options.html (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/pipe-to-options.html 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/LayoutTests/streams/reference-implementation/pipe-to-options.html 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> c.enqueue('a');
</span><span class="cx"> setTimeout(test1.step_func(function() { c.enqueue('b'); }), 200);
</span><span class="cx"> setTimeout(test1.step_func(function() {
</span><del>- c.enqueue('c'); // Enqueue after cancel should not throw.
</del><ins>+ assert_throws(new TypeError(), function() { c.enqueue('c'); }); // Enqueue after cancel should throw.
</ins><span class="cx"> assert_true(cancelCalled);
</span><span class="cx"> test1.done();
</span><span class="cx"> }), 500);
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> c.enqueue('a');
</span><span class="cx"> setTimeout(test2.step_func(function() { c.enqueue('b'); }), 200);
</span><span class="cx"> setTimeout(test2.step_func(function() {
</span><del>- c.enqueue('c'); // Enqueue after cancel should not throw.
</del><ins>+ assert_throws(new TypeError(), function() { c.enqueue('c'); }); // Enqueue after cancel should throw.
</ins><span class="cx"> assert_true(cancelCalled);
</span><span class="cx"> test2.done();
</span><span class="cx"> }), 500);
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -400,10 +400,23 @@
</span><span class="cx">
</span><span class="cx"> templatedRSTwoChunksClosed('ReadableStream (two chunks enqueued async, then closed)', function() {
</span><span class="cx"> return new ReadableStream({
</span><ins>+ _cancelled: false,
</ins><span class="cx"> start: function(c) {
</span><del>- setTimeout(function() { c.enqueue(chunks[0]); }, 100);
- setTimeout(function() { c.enqueue(chunks[1]); }, 200);
- setTimeout(function() { c.close(); }, 300);
</del><ins>+ setTimeout(() => {
+ if (!this._cancelled)
+ c.enqueue(chunks[0]);
+ }, 100);
+ setTimeout(() => {
+ if (!this._cancelled)
+ c.enqueue(chunks[1]);
+ }, 200);
+ setTimeout(() => {
+ if (!this._cancelled)
+ c.close();
+ }, 300);
+ },
+ cancel: function(reason) {
+ this._cancelled = true;
</ins><span class="cx"> }
</span><span class="cx"> })},
</span><span class="cx"> chunks
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/Source/WebCore/ChangeLog 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-19 Youenn Fablet <youenn@apple.com>
+
+ [Streams API] ReadableStreamController methods should throw if its stream is not readable
+ https://bugs.webkit.org/show_bug.cgi?id=159871
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Spec now mandates close and enqueue to throw if ReadableStream is not readable.
+ Covered by rebased and/or modified tests.
+
+ * Modules/streams/ReadableStreamController.js:
+ (enqueue): Throwing a TypeError if controlled stream is not readable.
+ (close): Ditto.
+
</ins><span class="cx"> 2016-07-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Bubbles appear split for a brief moment in Messages
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamController.js (203410 => 203411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamController.js 2016-07-19 17:23:59 UTC (rev 203410)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamController.js 2016-07-19 17:27:32 UTC (rev 203411)
</span><span class="lines">@@ -33,12 +33,13 @@
</span><span class="cx"> throw new @TypeError("Function should be called on a ReadableStreamController");
</span><span class="cx">
</span><span class="cx"> const stream = this.@controlledReadableStream;
</span><del>- if (stream.@state === @streamErrored)
- throw stream.@storedError;
</del><span class="cx">
</span><span class="cx"> if (stream.@closeRequested)
</span><span class="cx"> throw new @TypeError("ReadableStream is requested to close");
</span><span class="cx">
</span><ins>+ if (stream.@state !== @streamReadable)
+ throw new @TypeError("ReadableStream is not readable");
+
</ins><span class="cx"> return @enqueueInReadableStream(stream, chunk);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,8 +68,8 @@
</span><span class="cx"> if (stream.@closeRequested)
</span><span class="cx"> throw new @TypeError("ReadableStream is already requested to close");
</span><span class="cx">
</span><del>- if (stream.@state === @streamErrored)
- throw new @TypeError("ReadableStream is already errored");
</del><ins>+ if (stream.@state !== @streamReadable)
+ throw new @TypeError("ReadableStream is not readable");
</ins><span class="cx">
</span><span class="cx"> @closeReadableStream(stream);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>