<!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>[194391] 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/194391">194391</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-23 10:13:57 -0800 (Wed, 23 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] In RS during enqueuing error should be reported only if readable
https://bugs.webkit.org/show_bug.cgi?id=152505
Reviewed by Youenn Fablet.
LayoutTests/imported/w3c:
Updated imported spec tests.
* web-platform-tests/streams-api/README.txt: Updated spec version.
* web-platform-tests/streams-api/readable-streams/bad-strategies-expected.txt: Expectations.
* web-platform-tests/streams-api/readable-streams/bad-strategies.js: Added two new tests.
Source/WebCore:
This commit fixes last spec change done in
https://github.com/whatwg/streams/commit/4ba861e6f60c248060811830e11271c84b439cc3.
Test: imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies.html
* Modules/streams/ReadableStreamInternals.js:
(enqueueInReadableStream): Call @errorReadableStream only if state is readable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsapiREADMEtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamsbadstrategiesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamsbadstrategiesjs">trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (194390 => 194391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-12-23 16:56:13 UTC (rev 194390)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-12-23 18:13:57 UTC (rev 194391)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-23 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] In RS during enqueuing error should be reported only if readable
+ https://bugs.webkit.org/show_bug.cgi?id=152505
+
+ Reviewed by Youenn Fablet.
+
+ Updated imported spec tests.
+
+ * web-platform-tests/streams-api/README.txt: Updated spec version.
+ * web-platform-tests/streams-api/readable-streams/bad-strategies-expected.txt: Expectations.
+ * web-platform-tests/streams-api/readable-streams/bad-strategies.js: Added two new tests.
+
</ins><span class="cx"> 2015-12-21 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.html has a flaky test
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsapiREADMEtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt (194390 => 194391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt 2015-12-23 16:56:13 UTC (rev 194390)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt 2015-12-23 18:13:57 UTC (rev 194391)
</span><span class="lines">@@ -3,4 +3,4 @@
</span><span class="cx"> There is a plan to move these tests to web-platform-tests repository so from that moment on this importation will be
</span><span class="cx"> automatic.
</span><span class="cx">
</span><del>-Current version: https://github.com/whatwg/streams/tree/f7cb0eac03e6a6d045d6e8c09df1f9f8a264fdef/reference-implementation/web-platform-tests.
</del><ins>+Current version: https://github.com/whatwg/streams/tree/2e7f87e45806d58114592c923aed299798d10161/reference-implementation/web-platform-tests.
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamsbadstrategiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies-expected.txt (194390 => 194391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies-expected.txt 2015-12-23 16:56:13 UTC (rev 194390)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies-expected.txt 2015-12-23 18:13:57 UTC (rev 194391)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx">
</span><span class="cx"> PASS Readable stream: throwing strategy.size getter
</span><ins>+PASS Readable stream: strategy.size errors the stream and then throws
+PASS Readable stream: strategy.size errors the stream and then returns Infinity
</ins><span class="cx"> PASS Readable stream: throwing strategy.size method
</span><span class="cx"> PASS Readable stream: throwing strategy.highWaterMark getter
</span><span class="cx"> PASS Readable stream: invalid strategy.highWaterMark
</span><span class="lines">@@ -10,6 +12,8 @@
</span><span class="cx"> new ReadableStream({}, {
</span><span class="cx"> get size() {
</span><span class="cx"> ..." threw object "ReferenceError: Can't find variable: ReadableStream" ("ReferenceError") expected object "Error: a unique string" ("Error")
</span><ins>+FAIL Readable stream: strategy.size errors the stream and then throws Can't find variable: ReadableStream
+FAIL Readable stream: strategy.size errors the stream and then returns Infinity Can't find variable: ReadableStream
</ins><span class="cx"> FAIL Readable stream: throwing strategy.size method Can't find variable: ReadableStream
</span><span class="cx"> FAIL Readable stream: throwing strategy.highWaterMark getter assert_throws: construction should re-throw the error function "() => {
</span><span class="cx"> new ReadableStream({}, {
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamsbadstrategiesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies.js (194390 => 194391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies.js 2015-12-23 16:56:13 UTC (rev 194390)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies.js 2015-12-23 18:13:57 UTC (rev 194391)
</span><span class="lines">@@ -19,6 +19,60 @@
</span><span class="cx">
</span><span class="cx"> }, 'Readable stream: throwing strategy.size getter');
</span><span class="cx">
</span><ins>+test(() => {
+
+ const theError = new Error('a unique string');
+
+ let controller;
+ const rs = new ReadableStream(
+ {
+ start(c) {
+ controller = c;
+ }
+ },
+ {
+ size() {
+ controller.error(theError);
+ throw theError;
+ },
+ highWaterMark: 5
+ }
+ );
+
+ assert_throws(theError, () => {
+ controller.enqueue('a');
+ }, 'enqueue should re-throw the error');
+
+}, 'Readable stream: strategy.size errors the stream and then throws');
+
+test(() => {
+
+ const theError = new Error('a unique string');
+
+ let controller;
+ const rs = new ReadableStream(
+ {
+ start(c) {
+ controller = c;
+ }
+ },
+ {
+ size() {
+ controller.error(theError);
+ return Infinity;
+ },
+ highWaterMark: 5
+ }
+ );
+
+ try {
+ controller.enqueue('a');
+ } catch (error) {
+ assert_equals(error.name, 'RangeError', 'enqueue should throw a RangeError');
+ }
+
+}, 'Readable stream: strategy.size errors the stream and then returns Infinity');
+
</ins><span class="cx"> promise_test(() => {
</span><span class="cx">
</span><span class="cx"> const theError = new Error('a unique string');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194390 => 194391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-23 16:56:13 UTC (rev 194390)
+++ trunk/Source/WebCore/ChangeLog 2015-12-23 18:13:57 UTC (rev 194391)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-23 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] In RS during enqueuing error should be reported only if readable
+ https://bugs.webkit.org/show_bug.cgi?id=152505
+
+ Reviewed by Youenn Fablet.
+
+ This commit fixes last spec change done in
+ https://github.com/whatwg/streams/commit/4ba861e6f60c248060811830e11271c84b439cc3.
+
+ Test: imported/w3c/web-platform-tests/streams-api/readable-streams/bad-strategies.html
+
+ * Modules/streams/ReadableStreamInternals.js:
+ (enqueueInReadableStream): Call @errorReadableStream only if state is readable.
+
</ins><span class="cx"> 2015-12-23 Chris Aljoudi <chris@chrismatic.io> and Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Content blockers should be able to promote http to https
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (194390 => 194391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-23 16:56:13 UTC (rev 194390)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-23 18:13:57 UTC (rev 194391)
</span><span class="lines">@@ -328,7 +328,8 @@
</span><span class="cx"> @enqueueValueWithSize(stream.@queue, chunk, size);
</span><span class="cx"> }
</span><span class="cx"> catch(error) {
</span><del>- @errorReadableStream(stream, error);
</del><ins>+ if (stream.@state === @streamReadable)
+ @errorReadableStream(stream, error);
</ins><span class="cx"> throw error;
</span><span class="cx"> }
</span><span class="cx"> @requestReadableStreamPull(stream);
</span></span></pre>
</div>
</div>
</body>
</html>