<!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>[209915] 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/209915">209915</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-16 02:01:49 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Readable Streams API] Implement ReadableByteStreamController cancel internal method
https://bugs.webkit.org/show_bug.cgi?id=165798
Patch by Romain Bellessort <romain.bellessort@crf.canon.fr> on 2016-12-16
Reviewed by Youenn Fablet.
Source/WebCore:
Implemented cancel method of ReadableByteStreamController.
Also fixed small inconsistency in readableByteStreamControllerClose.
Added one test to check cancel behaviour. More tests may be added as the API is implemented.
* Modules/streams/ReadableByteStreamInternals.js:
(privateInitializeReadableByteStreamController): Define cancel internal method.
(readableByteStreamControllerCancel): Added.
(readableByteStreamControllerClose): Fixed behaviour (no value should be dequeued).
* bindings/js/WebCoreBuiltinNames.h: Removed bytesFilled (previous addition was not needed).
LayoutTests:
Added one test to check cancel behaviour. More tests may be added as the API is implemented.
Also replaced async_test by promise_test where applicable.
* streams/readable-byte-stream-controller-expected.txt: Updated expectations.
* streams/readable-byte-stream-controller.js: Added one test.</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>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh">trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209914 => 209915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-16 08:42:29 UTC (rev 209914)
+++ trunk/LayoutTests/ChangeLog 2016-12-16 10:01:49 UTC (rev 209915)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-16 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableByteStreamController cancel internal method
+ https://bugs.webkit.org/show_bug.cgi?id=165798
+
+ Reviewed by Youenn Fablet.
+
+ Added one test to check cancel behaviour. More tests may be added as the API is implemented.
+ Also replaced async_test by promise_test where applicable.
+
+ * streams/readable-byte-stream-controller-expected.txt: Updated expectations.
+ * streams/readable-byte-stream-controller.js: Added one test.
+
</ins><span class="cx"> 2016-12-16 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> svg/as-image/svg-image-with-data-uri-use-data-uri.svg is flaky after r207754
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablebytestreamcontrollerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt (209914 => 209915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt 2016-12-16 08:42:29 UTC (rev 209914)
+++ trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt 2016-12-16 10:01:49 UTC (rev 209915)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> PASS Calling read() on a reader associated to a controller that has been closed should not be rejected
</span><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><ins>+PASS Calling cancel() on a readable ReadableStream that is not locked to a reader should return a promise whose fulfillment handler returns undefined
</ins><span class="cx"> PASS Creating a ReadableStream with an underlyingSource with type property set to 'bytes' should succeed
</span><span class="cx"> PASS ReadableByteStreamController instances should have the correct list of properties
</span><span class="cx"> PASS Calling error() with a this object different from ReadableByteStreamController should throw a TypeError
</span><span class="lines">@@ -23,4 +24,5 @@
</span><span class="cx"> PASS Calling read() on a reader associated to a controller that has been closed should not be rejected
</span><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><ins>+PASS Calling cancel() on a readable ReadableStream that is not locked to a reader should return a promise whose fulfillment handler returns undefined
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablebytestreamcontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-byte-stream-controller.js (209914 => 209915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-byte-stream-controller.js 2016-12-16 08:42:29 UTC (rev 209914)
+++ trunk/LayoutTests/streams/readable-byte-stream-controller.js 2016-12-16 10:01:49 UTC (rev 209915)
</span><span class="lines">@@ -145,8 +145,7 @@
</span><span class="cx"> });
</span><span class="cx"> }, "Calling close() after calling error() should throw a TypeError");
</span><span class="cx">
</span><del>-const test2 = async_test("Calling read() on a reader associated to a controller that has been errored should fail with provided error");
-test2.step(function() {
</del><ins>+promise_test(function(test) {
</ins><span class="cx"> let controller;
</span><span class="cx">
</span><span class="cx"> const rs = new ReadableStream({
</span><span class="lines">@@ -155,22 +154,13 @@
</span><span class="cx"> },
</span><span class="cx"> type: "bytes"
</span><span class="cx"> });
</span><del>- const myError = "my error";
</del><ins>+ const myError = new Error("my error");
</ins><span class="cx"> controller.error(myError);
</span><span class="cx">
</span><del>- rs.getReader().read().then(
- test2.step_func(function() {
- assert_unreached('read() should reject on an errored stream');
- }),
- test2.step_func(function(err) {
- assert_equals(myError, err);
- test2.done();
- })
- );
-});
</del><ins>+ return promise_rejects(test, myError, rs.getReader().read());
+}, "Calling read() on a reader associated to a controller that has been errored should fail with provided error");
</ins><span class="cx">
</span><del>-const test3 = async_test("Calling read() on a reader associated to a controller that has been closed should not be rejected");
-test3.step(function() {
</del><ins>+promise_test(function() {
</ins><span class="cx"> let controller;
</span><span class="cx">
</span><span class="cx"> const rs = new ReadableStream({
</span><span class="lines">@@ -182,19 +172,14 @@
</span><span class="cx">
</span><span class="cx"> controller.close();
</span><span class="cx">
</span><del>- rs.getReader().read().then(
- test3.step_func(function(res) {
</del><ins>+ return rs.getReader().read().then(
+ function(res) {
</ins><span class="cx"> assert_object_equals(res, {value: undefined, done: true});
</span><del>- test3.done();
- }),
- test3.step_func(function(err) {
- assert_unreached("read() should be fulfilled on a closed stream");
- })
</del><ins>+ }
</ins><span class="cx"> );
</span><del>-});
</del><ins>+}, "Calling read() on a reader associated to a controller that has been closed should not be rejected");
</ins><span class="cx">
</span><del>-const test4 = async_test("Calling read() after a chunk has been enqueued should result in obtaining said chunk");
-test4.step(function() {
</del><ins>+promise_test(function() {
</ins><span class="cx"> let controller;
</span><span class="cx">
</span><span class="cx"> const rs = new ReadableStream({
</span><span class="lines">@@ -206,16 +191,12 @@
</span><span class="cx">
</span><span class="cx"> controller.enqueue("test");
</span><span class="cx">
</span><del>- rs.getReader().read().then(
- test4.step_func(function(res) {
</del><ins>+ return rs.getReader().read().then(
+ function(res) {
</ins><span class="cx"> assert_object_equals(res, {value: "test", done: false});
</span><del>- test4.done();
- }),
- test4.step_func(function(err) {
- assert_unreached("read() should be fulfilled after enqueue");
- })
</del><ins>+ }
</ins><span class="cx"> );
</span><del>-});
</del><ins>+}, "Calling read() after a chunk has been enqueued should result in obtaining said chunk");
</ins><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="cx"> let controller;
</span><span class="lines">@@ -230,4 +211,16 @@
</span><span class="cx"> assert_equals(controller.desiredSize, 1, "by default initial value of desiredSize should be 1");
</span><span class="cx"> }, "By default initial value of desiredSize should be 1");
</span><span class="cx">
</span><ins>+promise_test(function() {
+ const rs = new ReadableStream({
+ type: "bytes"
+ });
+
+ return rs.cancel().then(
+ function(res) {
+ assert_object_equals(res, undefined);
+ }
+ );
+}, "Calling cancel() on a readable ReadableStream that is not locked to a reader should return a promise whose fulfillment handler returns undefined");
+
</ins><span class="cx"> done();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209914 => 209915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-16 08:42:29 UTC (rev 209914)
+++ trunk/Source/WebCore/ChangeLog 2016-12-16 10:01:49 UTC (rev 209915)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-16 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableByteStreamController cancel internal method
+ https://bugs.webkit.org/show_bug.cgi?id=165798
+
+ Reviewed by Youenn Fablet.
+
+ Implemented cancel method of ReadableByteStreamController.
+ Also fixed small inconsistency in readableByteStreamControllerClose.
+
+ Added one test to check cancel behaviour. More tests may be added as the API is implemented.
+
+ * Modules/streams/ReadableByteStreamInternals.js:
+ (privateInitializeReadableByteStreamController): Define cancel internal method.
+ (readableByteStreamControllerCancel): Added.
+ (readableByteStreamControllerClose): Fixed behaviour (no value should be dequeued).
+ * bindings/js/WebCoreBuiltinNames.h: Removed bytesFilled (previous addition was not needed).
+
</ins><span class="cx"> 2016-12-16 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> svg/as-image/svg-image-with-data-uri-use-data-uri.svg is flaky after r207754
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableByteStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js (209914 => 209915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2016-12-16 08:42:29 UTC (rev 209914)
+++ trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2016-12-16 10:01:49 UTC (rev 209915)
</span><span class="lines">@@ -71,7 +71,8 @@
</span><span class="cx"> // FIXME: Implement readableByteStreamControllerError.
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // FIXME: Implement cancel and pull.
</del><ins>+ this.@cancel = @readableByteStreamControllerCancel;
+ // FIXME: Implement pull.
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="lines">@@ -85,6 +86,17 @@
</span><span class="cx"> return @isObject(controller) && !!controller.@underlyingByteSource;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function readableByteStreamControllerCancel(controller, reason)
+{
+ "use strict";
+
+ if (controller.@pendingPullIntos.content.length > 0)
+ controller.@pendingPullIntos[0].bytesFilled = 0;
+ controller.@queue = @newQueue();
+ controller.@totalQueuedBytes = 0;
+ return @promiseInvokeOrNoop(controller.@underlyingByteSource, "cancel", [reason]);
+}
+
</ins><span class="cx"> function readableByteStreamControllerError(controller, e)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="lines">@@ -108,8 +120,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (controller.@pendingPullIntos.content.length > 0) {
</span><del>- const firstPendingPullInto = @dequeueValue(controller.@pendingPullIntos);
- if (firstPendingPullInto.@bytesFilled > 0) {
</del><ins>+ if (controller.@pendingPullIntos[0].bytesFilled > 0) {
</ins><span class="cx"> const e = new @TypeError("Close requested while there remain pending bytes");
</span><span class="cx"> @readableByteStreamControllerError(controller, e);
</span><span class="cx"> throw e;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (209914 => 209915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-12-16 08:42:29 UTC (rev 209914)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-12-16 10:01:49 UTC (rev 209915)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> macro(appendFromJS) \
</span><span class="cx"> macro(autoAllocateChunkSize) \
</span><span class="cx"> macro(body) \
</span><del>- macro(bytesFilled) \
</del><span class="cx"> macro(cancel) \
</span><span class="cx"> macro(cloneForJS) \
</span><span class="cx"> macro(closeRequested) \
</span></span></pre>
</div>
</div>
</body>
</html>