<!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>[191285] 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/191285">191285</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-10-19 03:09:07 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Implement ReadableStream tee
https://bugs.webkit.org/show_bug.cgi?id=146315
Reviewed by Darin Adler.
Source/WebCore:
Covered by rebased test.
* Modules/streams/ReadableStream.js:
(tee): Removing not implemented exception throwing.
* Modules/streams/ReadableStreamInternals.js:
(teeReadableStream): Implementing as per spec.
(teeReadableStreamPullFunction): Ditto.
(teeReadableStreamBranch2CancelFunction): Ditto.
LayoutTests:
* streams/reference-implementation/readable-stream-tee-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamteeexpectedtxt">trunk/LayoutTests/streams/reference-implementation/readable-stream-tee-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamjs">trunk/Source/WebCore/Modules/streams/ReadableStream.js</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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191284 => 191285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-19 09:48:51 UTC (rev 191284)
+++ trunk/LayoutTests/ChangeLog 2015-10-19 10:09:07 UTC (rev 191285)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Implement ReadableStream tee
+ https://bugs.webkit.org/show_bug.cgi?id=146315
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/readable-stream-tee-expected.txt:
+
</ins><span class="cx"> 2015-10-19 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Add skeleton for initial WritableStream support
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamteeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-tee-expected.txt (191284 => 191285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-tee-expected.txt 2015-10-19 09:48:51 UTC (rev 191284)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-tee-expected.txt 2015-10-19 10:09:07 UTC (rev 191285)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx">
</span><del>-FAIL ReadableStream teeing: rs.tee() returns an array of two ReadableStreams tee is not implemented
-FAIL ReadableStream teeing: should be able to read one branch to the end without affecting the other tee is not implemented
-FAIL ReadableStream teeing: values should be equal across each branch tee is not implemented
-FAIL ReadableStream teeing: errors in the source should propagate to both branches tee is not implemented
-FAIL ReadableStream teeing: canceling branch1 should not impact branch2 tee is not implemented
-FAIL ReadableStream teeing: canceling branch2 should not impact branch1 tee is not implemented
-FAIL ReadableStream teeing: canceling both branches should aggregate the cancel reasons into an array tee is not implemented
-FAIL ReadableStream teeing: failing to cancel the original stream should cause cancel() to reject on branches tee is not implemented
-FAIL ReadableStream teeing: closing the original should immediately close the branches tee is not implemented
-FAIL ReadableStream teeing: erroring the original should immediately error the branches tee is not implemented
</del><ins>+PASS ReadableStream teeing: rs.tee() returns an array of two ReadableStreams
+PASS ReadableStream teeing: should be able to read one branch to the end without affecting the other
+PASS ReadableStream teeing: values should be equal across each branch
+PASS ReadableStream teeing: errors in the source should propagate to both branches
+PASS ReadableStream teeing: canceling branch1 should not impact branch2
+PASS ReadableStream teeing: canceling branch2 should not impact branch1
+PASS ReadableStream teeing: canceling both branches should aggregate the cancel reasons into an array
+PASS ReadableStream teeing: failing to cancel the original stream should cause cancel() to reject on branches
+PASS ReadableStream teeing: closing the original should immediately close the branches
+PASS ReadableStream teeing: erroring the original should immediately error the branches
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191284 => 191285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-19 09:48:51 UTC (rev 191284)
+++ trunk/Source/WebCore/ChangeLog 2015-10-19 10:09:07 UTC (rev 191285)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Implement ReadableStream tee
+ https://bugs.webkit.org/show_bug.cgi?id=146315
+
+ Reviewed by Darin Adler.
+
+ Covered by rebased test.
+
+ * Modules/streams/ReadableStream.js:
+ (tee): Removing not implemented exception throwing.
+ * Modules/streams/ReadableStreamInternals.js:
+ (teeReadableStream): Implementing as per spec.
+ (teeReadableStreamPullFunction): Ditto.
+ (teeReadableStreamBranch2CancelFunction): Ditto.
+
</ins><span class="cx"> 2015-10-19 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Add skeleton for initial WritableStream support
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (191284 => 191285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-10-19 09:48:51 UTC (rev 191284)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-10-19 10:09:07 UTC (rev 191285)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> if (!@isReadableStream(this))
</span><span class="cx"> throw new @TypeError("Function should be called on a ReadableStream");
</span><span class="cx">
</span><del>- throw new @TypeError("tee is not implemented");
</del><ins>+ return @teeReadableStream(this, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function locked()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (191284 => 191285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-10-19 09:48:51 UTC (rev 191284)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-10-19 10:09:07 UTC (rev 191285)
</span><span class="lines">@@ -78,9 +78,101 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- throw new @TypeError("tee is not implemented");
</del><ins>+ // TODO: Assert: IsReadableStream(stream) is true.
+ // TODO: Assert: Type(shouldClone) is Boolean.
+
+ let reader = stream.getReader();
+
+ let teeState = {
+ closedOrErrored: false,
+ canceled1: false,
+ canceled2: false,
+ reason1: undefined,
+ reason: undefined,
+ };
+
+ teeState.cancelPromise = new @InternalPromise(function(resolve, reject) {
+ teeState.resolvePromise = resolve;
+ teeState.rejectPromise = reject;
+ });
+
+ let pullFunction = @teeReadableStreamPullFunction(teeState, reader, shouldClone);
+
+ let underlyingSource1 = {
+ "pull": pullFunction,
+ "cancel": @teeReadableStreamBranch1CancelFunction(teeState, stream)
+ };
+
+ let underlyingSource2 = {
+ "pull": pullFunction,
+ "cancel": @teeReadableStreamBranch2CancelFunction(teeState, stream)
+ };
+
+ let branch1 = new ReadableStream(underlyingSource1);
+ let branch2 = new ReadableStream(underlyingSource2);
+
+ reader.closed.catch(function(e) {
+ if (teeState.closedOrErrored)
+ return;
+ @errorReadableStream(branch1, e);
+ @errorReadableStream(branch2, e);
+ teeState.closedOrErrored = true;
+ });
+
+ // Additional fields compared to the spec, as they are needed within pull/cancel functions.
+ teeState.branch1 = branch1;
+ teeState.branch2 = branch2;
+
+ return [branch1, branch2];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function teeReadableStreamPullFunction(teeState, reader, shouldClone)
+{
+ return function() {
+ reader.read().then(function(result) {
+ if (result.done && !teeState.closedOrErrored) {
+ @closeReadableStream(teeState.branch1);
+ @closeReadableStream(teeState.branch2);
+ teeState.closedOrErrored = true;
+ }
+ if (teeState.closedOrErrored)
+ return;
+ if (!teeState.canceled1) {
+ // TODO: Implement cloning if shouldClone is true
+ @enqueueInReadableStream(teeState.branch1, result.value);
+ }
+ if (!teeState.canceled2) {
+ // TODO: Implement cloning if shouldClone is true
+ @enqueueInReadableStream(teeState.branch2, result.value);
+ }
+ });
+ }
+}
+
+function teeReadableStreamBranch1CancelFunction(teeState, stream)
+{
+ return function(r) {
+ teeState.canceled1 = true;
+ teeState.reason1 = r;
+ if (teeState.canceled2) {
+ @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).then(teeState.resolvePromise, teeState.rejectPromise);
+ }
+ return teeState.cancelPromise;
+ }
+}
+
+function teeReadableStreamBranch2CancelFunction(teeState, stream)
+{
+ return function(r) {
+ teeState.canceled2 = true;
+ teeState.reason2 = r;
+ if (teeState.canceled1) {
+ @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).then(teeState.resolvePromise, teeState.rejectPromise);
+ }
+ return teeState.cancelPromise;
+ }
+}
+
</ins><span class="cx"> function isReadableStream(stream)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre>
</div>
</div>
</body>
</html>