<!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>[188580] 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/188580">188580</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-08-18 01:25:22 -0700 (Tue, 18 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Update implementation with the latest spec
https://bugs.webkit.org/show_bug.cgi?id=147978
Reviewed by Darin Adler.
Source/WebCore:
Changed the way the read and closed promises are resolved and the stream is released when an even closes or
errors the stream.
Current tests suffice after changing the order of the promise resolution according to the new spec.
* Modules/streams/ReadableStream.cpp:
(WebCore::ReadableStream::releaseReader): Changed how the promises are resolved.
(WebCore::ReadableStream::changeStateToErrored): Changed how the promises are resolved and manually releasing
the stream instead of calling releaseReader according to the spec.
LayoutTests:
Changed tests about the order of the read and closed promise resolution.
* streams/readable-stream-reader-read.html:
* streams/reference-implementation/readable-stream-tee.html:
* streams/reference-implementation/readable-stream-templated.html:
* streams/reference-implementation/readable-stream.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreamreaderreadhtml">trunk/LayoutTests/streams/readable-stream-reader-read.html</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamteehtml">trunk/LayoutTests/streams/reference-implementation/readable-stream-tee.html</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedhtml">trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamhtml">trunk/LayoutTests/streams/reference-implementation/readable-stream.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamcpp">trunk/Source/WebCore/Modules/streams/ReadableStream.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/LayoutTests/ChangeLog 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-08-18 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Update implementation with the latest spec
+ https://bugs.webkit.org/show_bug.cgi?id=147978
+
+ Reviewed by Darin Adler.
+
+ Changed tests about the order of the read and closed promise resolution.
+
+ * streams/readable-stream-reader-read.html:
+ * streams/reference-implementation/readable-stream-tee.html:
+ * streams/reference-implementation/readable-stream-templated.html:
+ * streams/reference-implementation/readable-stream.html:
+
</ins><span class="cx"> 2015-08-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r188539, r188544, r188552, and
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreamreaderreadhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-stream-reader-read.html (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-reader-read.html 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/LayoutTests/streams/readable-stream-reader-read.html 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -15,18 +15,15 @@
</span><span class="cx">
</span><span class="cx"> reader.read().then(test1.step_func(function(result) {
</span><span class="cx"> assert_object_equals(result, { value: undefined, done: true }, 'read() should fulfill with close');
</span><del>- assert_equals(counter, 1);
- counter++;
</del><ins>+ assert_equals(++counter, 1);
</ins><span class="cx"> }));
</span><span class="cx"> reader.read().then(test1.step_func(function(result) {
</span><span class="cx"> assert_object_equals(result, { value: undefined, done: true }, 'read() should fulfill with close');
</span><del>- assert_equals(counter, 2);
- counter++;
- test1.done();
</del><ins>+ assert_equals(++counter, 2);
</ins><span class="cx"> }));
</span><span class="cx"> reader.closed.then(test1.step_func(function() {
</span><del>- assert_equals(counter, 0);
- counter++;
</del><ins>+ assert_equals(++counter, 3);
+ test1.done();
</ins><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> controller.close();
</span><span class="lines">@@ -118,23 +115,20 @@
</span><span class="cx"> assert_unreached('read() should reject on an errored stream');
</span><span class="cx"> }), test4.step_func(function(err) {
</span><span class="cx"> assert_equals(myError, err);
</span><del>- assert_equals(counter, 1);
- counter++;
</del><ins>+ assert_equals(++counter, 1);
</ins><span class="cx"> }));
</span><span class="cx"> reader.read().then(test4.step_func(function() {
</span><span class="cx"> assert_unreached('read() should reject on an errored stream');
</span><span class="cx"> }), test4.step_func(function(err) {
</span><span class="cx"> assert_equals(myError, err);
</span><del>- assert_equals(counter, 2);
- counter++;
- test4.done();
</del><ins>+ assert_equals(++counter, 2);
</ins><span class="cx"> }));
</span><span class="cx"> reader.closed.then(test4.step_func(function() {
</span><span class="cx"> assert_unreached('read() should reject on an errored stream');
</span><span class="cx"> }), test4.step_func(function(err) {
</span><span class="cx"> assert_equals(myError, err);
</span><del>- assert_equals(counter, 0);
- counter++;
</del><ins>+ assert_equals(++counter, 3);
+ test4.done();
</ins><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> var myError = { potato: 'mashed' };
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamteehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-tee.html (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-tee.html 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-tee.html 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx">
</span><span class="cx"> var test1 = async_test('ReadableStream teeing: should be able to read one branch to the end without affecting the other');
</span><span class="cx"> test1.step(function() {
</span><del>- var closedCalled = false;
</del><span class="cx"> var readCalls = 0;
</span><span class="cx"> const rs = new ReadableStream({
</span><span class="cx"> start: function(c) {
</span><span class="lines">@@ -33,7 +32,8 @@
</span><span class="cx"> var reader2 = branch2.getReader();
</span><span class="cx">
</span><span class="cx"> reader1.closed.then(test1.step_func(function() {
</span><del>- closedCalled = true;
</del><ins>+ assert_equals(readCalls, 4);
+ test1.done();
</ins><span class="cx"> })).catch(test1.step_func(function(e) { assert_unreached(e); }));
</span><span class="cx"> reader2.closed.then(test1.step_func(function() { assert_unreached('branch2 should not be closed'); }));
</span><span class="cx">
</span><span class="lines">@@ -47,9 +47,7 @@
</span><span class="cx"> }));
</span><span class="cx"> reader1.read().then(test1.step_func(function(r) {
</span><span class="cx"> assert_object_equals(r, { value: undefined, done: true }, 'third read() from branch1 should be done');
</span><del>- assert_true(closedCalled);
- assert_equals(++readCalls, 4);
- test1.done();
</del><ins>+ ++readCalls;
</ins><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> reader2.read().then(test1.step_func(function(r) {
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -81,12 +81,13 @@
</span><span class="cx">
</span><span class="cx"> reader.closed.catch(test1.step_func(function(e) {
</span><span class="cx"> assert_equals(e, error, 'reader.closed should reject with the error');
</span><del>- ++promisesCount;
</del><ins>+ if (++promisesCount === 2)
+ test1.done();
</ins><span class="cx"> }));
</span><span class="cx"> reader.read().catch(test1.step_func(function(e) {
</span><span class="cx"> assert_equals(e, error, 'reader.read() should reject with the error');
</span><del>- assert_equals(++promisesCount, 2);
- test1.done();
</del><ins>+ if (++promisesCount === 2)
+ test1.done();
</ins><span class="cx"> }));
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream.html (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream.html 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream.html 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -240,15 +240,15 @@
</span><span class="cx">
</span><span class="cx"> reader.closed.catch(test5.step_func(function(e) {
</span><span class="cx"> closed = true;
</span><del>- assert_false(read);
</del><ins>+ assert_true(read);
</ins><span class="cx"> assert_equals(e, error, 'closed should reject with the thrown error');
</span><ins>+ test5.done();
</ins><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> reader.read().catch(test5.step_func(function(e) {
</span><span class="cx"> read = true;
</span><del>- assert_true(closed);
</del><ins>+ assert_false(closed);
</ins><span class="cx"> assert_equals(e, error, 'read() should reject with the thrown error');
</span><del>- test5.done();
</del><span class="cx"> }));
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/Source/WebCore/ChangeLog 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-18 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Update implementation with the latest spec
+ https://bugs.webkit.org/show_bug.cgi?id=147978
+
+ Reviewed by Darin Adler.
+
+ Changed the way the read and closed promises are resolved and the stream is released when an even closes or
+ errors the stream.
+
+ Current tests suffice after changing the order of the promise resolution according to the new spec.
+
+ * Modules/streams/ReadableStream.cpp:
+ (WebCore::ReadableStream::releaseReader): Changed how the promises are resolved.
+ (WebCore::ReadableStream::changeStateToErrored): Changed how the promises are resolved and manually releasing
+ the stream instead of calling releaseReader according to the spec.
+
</ins><span class="cx"> 2015-08-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Outline with auto style leaves bits behind when the the box is moved.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.cpp (188579 => 188580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-08-18 06:33:51 UTC (rev 188579)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-08-18 08:25:22 UTC (rev 188580)
</span><span class="lines">@@ -90,15 +90,14 @@
</span><span class="cx">
</span><span class="cx"> void ReadableStream::releaseReader()
</span><span class="cx"> {
</span><del>- if (m_closedPromise)
- m_closedPromise.value().resolve(nullptr);
-
</del><span class="cx"> for (auto& request : m_readRequests)
</span><span class="cx"> request.resolveEnd();
</span><ins>+ if (m_reader)
+ m_releasedReaders.append(WTF::move(m_reader));
</ins><span class="cx">
</span><ins>+ if (m_closedPromise)
+ m_closedPromise.value().resolve(nullptr);
</ins><span class="cx"> clearCallbacks();
</span><del>- if (m_reader)
- m_releasedReaders.append(WTF::move(m_reader));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReadableStream::changeStateToErrored()
</span><span class="lines">@@ -107,18 +106,20 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> clearValues();
</span><ins>+
</ins><span class="cx"> m_state = State::Errored;
</span><span class="cx">
</span><ins>+ if (!m_reader)
+ return;
+
</ins><span class="cx"> JSC::JSValue error = this->error();
</span><del>- if (m_closedPromise)
- m_closedPromise.value().reject(error);
-
</del><span class="cx"> for (auto& request : m_readRequests)
</span><span class="cx"> request.reject(error);
</span><ins>+ m_releasedReaders.append(WTF::move(m_reader));
</ins><span class="cx">
</span><ins>+ if (m_closedPromise)
+ m_closedPromise.value().reject(error);
</ins><span class="cx"> clearCallbacks();
</span><del>- if (m_reader)
- releaseReader();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReadableStream::start()
</span></span></pre>
</div>
</div>
</body>
</html>