<!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>[211484] 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/211484">211484</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-01 08:17:52 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Readable Streams API] Implement ReadableByteStreamController pull()
https://bugs.webkit.org/show_bug.cgi?id=167593
Patch by Romain Bellessort <romain.bellessort@crf.canon.fr> on 2017-02-01
Reviewed by Youenn Fablet.
Source/WebCore:
Implemented pull() method for ReadableByteStreamController. Also updated
pendingPullIntos attribute, which was a more complex object than necessary
(an array is enough).
Added 2 tests that allow covering most of new code. Code not yet tested will
become reachable as the rest of the spec is implemented (new tests will then
be added).
* Modules/streams/ReadableByteStreamInternals.js:
(privateInitializeReadableByteStreamController): Updated pendingPullIntos.
(readableByteStreamControllerCancel): Updated pendingPullIntos.
(readableByteStreamControllerClose): Updated pendingPullIntos.
(readableByteStreamControllerHandleQueueDrain): Added.
(readableByteStreamControllerPull): Added.
LayoutTests:
Added 2 tests that allow covering most of new code. Code not yet tested will
become reachable as the rest of the spec is implemented (new tests will then
be added).
* streams/readable-byte-stream-controller-expected.txt:
* streams/readable-byte-stream-controller.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablebytestreamcontrollerexpectedtxt">trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablebytestreamcontrollerjs">trunk/LayoutTests/streams/readable-byte-stream-controller.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableByteStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211483 => 211484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-01 15:28:08 UTC (rev 211483)
+++ trunk/LayoutTests/ChangeLog 2017-02-01 16:17:52 UTC (rev 211484)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-01 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableByteStreamController pull()
+ https://bugs.webkit.org/show_bug.cgi?id=167593
+
+ Reviewed by Youenn Fablet.
+
+ Added 2 tests that allow covering most of new code. Code not yet tested will
+ become reachable as the rest of the spec is implemented (new tests will then
+ be added).
+
+ * streams/readable-byte-stream-controller-expected.txt:
+ * streams/readable-byte-stream-controller.js:
+
</ins><span class="cx"> 2017-02-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Propagate networking errors correctly for import() operator
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablebytestreamcontrollerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt (211483 => 211484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt 2017-02-01 15:28:08 UTC (rev 211483)
+++ trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt 2017-02-01 16:17:52 UTC (rev 211484)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> PASS Calling close() after calling error() should throw a TypeError
</span><span class="cx"> PASS Calling read() on a reader associated to a controller that has been errored should fail with provided error
</span><span class="cx"> PASS Calling read() on a reader associated to a controller that has been closed should not be rejected
</span><ins>+PASS Pending reading promise should be rejected if controller is errored (case where autoAllocateChunkSize is undefined)
+FAIL Pending reading promise should be rejected if controller is errored (case where autoAllocateChunkSize is specified) Can't find private variable: @Uint8Array
</ins><span class="cx"> FAIL Calling read() after a chunk has been enqueued should result in obtaining said chunk ReadableByteStreamController enqueue() is not implemented
</span><span class="cx"> PASS By default initial value of desiredSize should be 1
</span><span class="cx"> PASS Calling cancel() on a readable ReadableStream that is not locked to a reader should return a promise whose fulfillment handler returns undefined
</span><span class="lines">@@ -25,6 +27,8 @@
</span><span class="cx"> PASS Calling close() after calling error() should throw a TypeError
</span><span class="cx"> PASS Calling read() on a reader associated to a controller that has been errored should fail with provided error
</span><span class="cx"> PASS Calling read() on a reader associated to a controller that has been closed should not be rejected
</span><ins>+PASS Pending reading promise should be rejected if controller is errored (case where autoAllocateChunkSize is undefined)
+FAIL Pending reading promise should be rejected if controller is errored (case where autoAllocateChunkSize is specified) Can't find private variable: @Uint8Array
</ins><span class="cx"> FAIL Calling read() after a chunk has been enqueued should result in obtaining said chunk ReadableByteStreamController enqueue() is not implemented
</span><span class="cx"> PASS By default initial value of desiredSize should be 1
</span><span class="cx"> PASS Calling cancel() on a readable ReadableStream that is not locked to a reader should return a promise whose fulfillment handler returns undefined
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablebytestreamcontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-byte-stream-controller.js (211483 => 211484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-byte-stream-controller.js 2017-02-01 15:28:08 UTC (rev 211483)
+++ trunk/LayoutTests/streams/readable-byte-stream-controller.js 2017-02-01 16:17:52 UTC (rev 211484)
</span><span class="lines">@@ -179,6 +179,41 @@
</span><span class="cx"> );
</span><span class="cx"> }, "Calling read() on a reader associated to a controller that has been closed should not be rejected");
</span><span class="cx">
</span><ins>+promise_test(function(test) {
+ let controller;
+
+ const rs = new ReadableStream({
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ const myError = new Error("My error");
+ let readingPromise = rs.getReader().read();
+ controller.error(myError);
+
+ return promise_rejects(test, myError, readingPromise);
+}, "Pending reading promise should be rejected if controller is errored (case where autoAllocateChunkSize is undefined)");
+
+promise_test(function(test) {
+ let controller;
+
+ const rs = new ReadableStream({
+ autoAllocateChunkSize: 128,
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ const myError = new Error("My error");
+ let readingPromise = rs.getReader().read();
+ controller.error(myError);
+
+ return promise_rejects(test, myError, readingPromise);
+}, "Pending reading promise should be rejected if controller is errored (case where autoAllocateChunkSize is specified)");
+
</ins><span class="cx"> promise_test(function() {
</span><span class="cx"> let controller;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211483 => 211484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-01 15:28:08 UTC (rev 211483)
+++ trunk/Source/WebCore/ChangeLog 2017-02-01 16:17:52 UTC (rev 211484)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-01 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableByteStreamController pull()
+ https://bugs.webkit.org/show_bug.cgi?id=167593
+
+ Reviewed by Youenn Fablet.
+
+ Implemented pull() method for ReadableByteStreamController. Also updated
+ pendingPullIntos attribute, which was a more complex object than necessary
+ (an array is enough).
+
+ Added 2 tests that allow covering most of new code. Code not yet tested will
+ become reachable as the rest of the spec is implemented (new tests will then
+ be added).
+
+ * Modules/streams/ReadableByteStreamInternals.js:
+ (privateInitializeReadableByteStreamController): Updated pendingPullIntos.
+ (readableByteStreamControllerCancel): Updated pendingPullIntos.
+ (readableByteStreamControllerClose): Updated pendingPullIntos.
+ (readableByteStreamControllerHandleQueueDrain): Added.
+ (readableByteStreamControllerPull): Added.
+
</ins><span class="cx"> 2017-02-01 Enrique Ocaña González <eocanha@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][MSE] qtdemux: Update the tfdt patch to the version finally accepted upstream
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableByteStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js (211483 => 211484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2017-02-01 15:28:08 UTC (rev 211483)
+++ trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2017-02-01 16:17:52 UTC (rev 211484)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> @throwRangeError("autoAllocateChunkSize value is negative or equal to positive or negative infinity");
</span><span class="cx"> }
</span><span class="cx"> this.@autoAllocateChunkSize = autoAllocateChunkSize;
</span><del>- this.@pendingPullIntos = @newQueue();
</del><ins>+ this.@pendingPullIntos = [];
</ins><span class="cx">
</span><span class="cx"> const controller = this;
</span><span class="cx"> const startResult = @promiseInvokeOrNoopNoCatch(underlyingByteSource, "start", [this]).@then(() => {
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.@cancel = @readableByteStreamControllerCancel;
</span><del>- // FIXME: Implement pull.
</del><ins>+ this.@pull = @readableByteStreamControllerPull;
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- if (controller.@pendingPullIntos.content.length > 0)
</del><ins>+ if (controller.@pendingPullIntos.length > 0)
</ins><span class="cx"> controller.@pendingPullIntos[0].bytesFilled = 0;
</span><span class="cx"> controller.@queue = @newQueue();
</span><span class="cx"> controller.@totalQueuedBytes = 0;
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (controller.@pendingPullIntos.content.length > 0) {
</del><ins>+ if (controller.@pendingPullIntos.length > 0) {
</ins><span class="cx"> if (controller.@pendingPullIntos[0].bytesFilled > 0) {
</span><span class="cx"> const e = new @TypeError("Close requested while there remain pending bytes");
</span><span class="cx"> @readableByteStreamControllerError(controller, e);
</span><span class="lines">@@ -169,6 +169,62 @@
</span><span class="cx"> return stream.@reader !== @undefined && @isReadableStreamDefaultReader(stream.@reader);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function readableByteStreamControllerHandleQueueDrain(controller) {
+
+ "use strict";
+
+ @assert(controller.@controlledReadableStream.@state === @streamReadable);
+ if (!controller.@totalQueuedBytes && controller.@closeRequested)
+ @readableStreamClose(controller.@controlledReadableStream);
+ else
+ @readableByteStreamControllerCallPullIfNeeded(controller);
+}
+
+function readableByteStreamControllerPull(controller)
+{
+ "use strict";
+
+ const stream = controller.@controlledReadableStream;
+ @assert(@readableStreamHasDefaultReader(stream));
+
+ if (controller.@totalQueuedBytes > 0) {
+ @assert(stream.@reader.@readRequests.length === 0);
+ const entry = @dequeueValue(controller.@queue);
+ controller.@totalQueuedBytes -= entry.byteLength;
+ @readableByteStreamControllerHandleQueueDrain(controller);
+ let view;
+ try {
+ view = new @Uint8Array(entry.buffer, entry.byteOffset, entry.byteLength);
+ } catch (error) {
+ return @Promise.@reject(error);
+ }
+ return @Promise.@resolve({value: view, done: false});
+ }
+
+ if (controller.@autoAllocateChunkSize !== @undefined) {
+ let buffer;
+ try {
+ buffer = new @ArrayBuffer(controller.@autoAllocateChunkSize);
+ } catch (error) {
+ return @Promise.@reject(error);
+ }
+ const pullIntoDescriptor = {
+ buffer,
+ byteOffset: 0,
+ byteLength: controller.@autoAllocateChunkSize,
+ bytesFilled: 0,
+ elementSize: 1,
+ ctor: @Uint8Array,
+ readerType: 'default'
+ };
+ controller.@pendingPullIntos.@push(pullIntoDescriptor);
+ }
+
+ const promise = @readableStreamAddReadRequest(stream);
+ @readableByteStreamControllerCallPullIfNeeded(controller);
+ return promise;
+}
+
</ins><span class="cx"> function readableByteStreamControllerShouldCallPull(controller)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="lines">@@ -181,9 +237,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!controller.@started)
</span><span class="cx"> return false;
</span><del>- if (@readableStreamHasDefaultReader(stream) && stream.@reader.@readRequests > 0)
</del><ins>+ if (@readableStreamHasDefaultReader(stream) && stream.@reader.@readRequests.length > 0)
</ins><span class="cx"> return true;
</span><del>- if (@readableStreamHasBYOBReader(stream) && stream.@reader.@readIntoRequests > 0)
</del><ins>+ if (@readableStreamHasBYOBReader(stream) && stream.@reader.@readIntoRequests.length > 0)
</ins><span class="cx"> return true;
</span><span class="cx"> if (@readableByteStreamControllerGetDesiredSize(controller) > 0)
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>