<!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>[208790] 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/208790">208790</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-16 06:00:37 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Readable Streams API] Implement ReadableByteStreamController close()
https://bugs.webkit.org/show_bug.cgi?id=164413
Patch by Romain Bellessort <romain.bellessort@crf.canon.fr> on 2016-11-16
Reviewed by Darin Adler.
Source/WebCore:
Implemented close() method of ReadableByteStreamController.
Updated test expectations for close() tests and added tests
to ensure errors are thrown in various cases defined by spec.
* Modules/streams/ReadableByteStreamController.js:
(close): Added.
* Modules/streams/ReadableByteStreamInternals.js:
(readableByteStreamControllerClose): Added.
* bindings/js/WebCoreBuiltinNames.h: Added bytesFilled.
LayoutTests:
Updated test expectations for close() tests and added tests
to ensure errors are thrown in various cases defined by spec.
* streams/readable-byte-stream-controller.js: Updated.</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="#trunkSourceWebCoreModulesstreamsReadableByteStreamControllerjs">trunk/Source/WebCore/Modules/streams/ReadableByteStreamController.js</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 (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/LayoutTests/ChangeLog 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-11-16 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableByteStreamController close()
+ https://bugs.webkit.org/show_bug.cgi?id=164413
+
+ Reviewed by Darin Adler.
+
+ Updated test expectations for close() tests and added tests
+ to ensure errors are thrown in various cases defined by spec.
+
+ * streams/readable-byte-stream-controller.js: Updated.
+
</ins><span class="cx"> 2016-11-16 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Integrate ES6 Modules into WebCore
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablebytestreamcontrollerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/LayoutTests/streams/readable-byte-stream-controller-expected.txt 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -1,14 +1,24 @@
</span><span class="cx">
</span><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><del>-PASS Calling error() with a this object different from ReadableByteStreamController should fail
-PASS Calling read() on a reader associated to a controller that has been errored should be rejected
-FAIL Calling read() on a reader associated to a controller that has been closed should not be rejected ReadableByteStreamController close() is not implemented
</del><ins>+PASS Calling error() with a this object different from ReadableByteStreamController should throw a TypeError
+PASS Calling close() with a this object different from ReadableByteStreamController should throw a TypeError
+PASS Calling error() after calling close() should throw a TypeError
+PASS Calling error() after calling error() should throw a TypeError
+PASS Calling close() after calling close() should throw a TypeError
+PASS Calling close() after calling error() should throw a TypeError
+PASS Calling read() on a reader associated to a controller that has been errored should fail with provided error
+PASS Calling read() on a reader associated to a controller that has been closed should not be rejected
</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 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><del>-PASS Calling error() with a this object different from ReadableByteStreamController should fail
-PASS Calling read() on a reader associated to a controller that has been errored should be rejected
-FAIL Calling read() on a reader associated to a controller that has been closed should not be rejected ReadableByteStreamController close() is not implemented
</del><ins>+PASS Calling error() with a this object different from ReadableByteStreamController should throw a TypeError
+PASS Calling close() with a this object different from ReadableByteStreamController should throw a TypeError
+PASS Calling error() after calling close() should throw a TypeError
+PASS Calling error() after calling error() should throw a TypeError
+PASS Calling close() after calling close() should throw a TypeError
+PASS Calling close() after calling error() should throw a TypeError
+PASS Calling read() on a reader associated to a controller that has been errored should fail with provided error
+PASS Calling read() on a reader associated to a controller that has been closed should not be rejected
</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">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablebytestreamcontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-byte-stream-controller.js (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-byte-stream-controller.js 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/LayoutTests/streams/readable-byte-stream-controller.js 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -61,9 +61,91 @@
</span><span class="cx">
</span><span class="cx"> assert_throws(new TypeError("Can only call ReadableByteStreamController.error on instances of ReadableByteStreamController"),
</span><span class="cx"> function() { controller.error.apply(rs); });
</span><del>-}, "Calling error() with a this object different from ReadableByteStreamController should fail");
</del><ins>+}, "Calling error() with a this object different from ReadableByteStreamController should throw a TypeError");
</ins><span class="cx">
</span><del>-const test2 = async_test("Calling read() on a reader associated to a controller that has been errored should be rejected");
</del><ins>+test(function() {
+ let controller;
+
+ const rs = new ReadableStream({
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ assert_throws(new TypeError("Can only call ReadableByteStreamController.close on instances of ReadableByteStreamController"),
+ function() { controller.close.apply(rs); });
+}, "Calling close() with a this object different from ReadableByteStreamController should throw a TypeError");
+
+test(function() {
+ let controller;
+
+ const rs = new ReadableStream({
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ assert_throws(new TypeError("ReadableStream is not readable"),
+ function() {
+ controller.close();
+ controller.error();
+ });
+}, "Calling error() after calling close() should throw a TypeError");
+
+test(function() {
+ let controller;
+
+ const rs = new ReadableStream({
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ assert_throws(new TypeError("ReadableStream is not readable"),
+ function() {
+ controller.error();
+ controller.error();
+ });
+}, "Calling error() after calling error() should throw a TypeError");
+
+test(function() {
+ let controller;
+
+ const rs = new ReadableStream({
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ assert_throws(new TypeError("Close has already been requested"),
+ function() {
+ controller.close();
+ controller.close();
+ });
+}, "Calling close() after calling close() should throw a TypeError");
+
+test(function() {
+ let controller;
+
+ const rs = new ReadableStream({
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ assert_throws(new TypeError("ReadableStream is not readable"),
+ function() {
+ controller.error();
+ controller.close();
+ });
+}, "Calling close() after calling error() should throw a TypeError");
+
+const test2 = async_test("Calling read() on a reader associated to a controller that has been errored should fail with provided error");
</ins><span class="cx"> test2.step(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 (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/Source/WebCore/ChangeLog 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-16 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableByteStreamController close()
+ https://bugs.webkit.org/show_bug.cgi?id=164413
+
+ Reviewed by Darin Adler.
+
+ Implemented close() method of ReadableByteStreamController.
+
+ Updated test expectations for close() tests and added tests
+ to ensure errors are thrown in various cases defined by spec.
+
+ * Modules/streams/ReadableByteStreamController.js:
+ (close): Added.
+ * Modules/streams/ReadableByteStreamInternals.js:
+ (readableByteStreamControllerClose): Added.
+ * bindings/js/WebCoreBuiltinNames.h: Added bytesFilled.
+
</ins><span class="cx"> 2016-11-16 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][GL] build broken when using gst-plugins-bad from git
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableByteStreamControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableByteStreamController.js (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableByteStreamController.js 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/Source/WebCore/Modules/streams/ReadableByteStreamController.js 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -50,8 +50,16 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- //FIXME: Implement appropriate behavior.
- @throwTypeError("ReadableByteStreamController close() is not implemented");
</del><ins>+ if (!@isReadableByteStreamController(this))
+ throw @makeThisTypeError("ReadableByteStreamController", "close");
+
+ if (this.@closeRequested)
+ @throwTypeError("Close has already been requested");
+
+ if (this.@controlledReadableStream.@state !== @streamReadable)
+ @throwTypeError("ReadableStream is not readable");
+
+ @readableByteStreamControllerClose(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function byobRequest()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableByteStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -95,6 +95,30 @@
</span><span class="cx"> @readableStreamError(controller.@controlledReadableStream, e);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function readableByteStreamControllerClose(controller)
+{
+ "use strict";
+
+ @assert(!controller.@closeRequested);
+ @assert(controller.@controlledReadableStream.@state === @streamReadable);
+
+ if (controller.@totalQueuedBytes > 0) {
+ controller.@closeRequested = true;
+ return;
+ }
+
+ if (controller.@pendingPullIntos.content.length > 0) {
+ const firstPendingPullInto = @dequeueValue(controller.@pendingPullIntos);
+ if (firstPendingPullInto.@bytesFilled > 0) {
+ const e = new @TypeError("Close requested while there remain pending bytes");
+ @readableByteStreamControllerError(controller, e);
+ throw e;
+ }
+ }
+
+ @readableStreamClose(controller.@controlledReadableStream);
+}
+
</ins><span class="cx"> function readableByteStreamControllerClearPendingPullIntos(controller)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (208789 => 208790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-11-16 12:00:03 UTC (rev 208789)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-11-16 14:00:37 UTC (rev 208790)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> macro(appendFromJS) \
</span><span class="cx"> macro(autoAllocateChunkSize) \
</span><span class="cx"> macro(body) \
</span><ins>+ macro(bytesFilled) \
</ins><span class="cx"> macro(cancel) \
</span><span class="cx"> macro(cloneForJS) \
</span><span class="cx"> macro(closeRequested) \
</span></span></pre>
</div>
</div>
</body>
</html>