<!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>[205248] 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/205248">205248</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-31 08:36:32 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Align getReader() with spec
https://bugs.webkit.org/show_bug.cgi?id=160508
Patch by Romain Bellessort <romain.bellessort@crf.canon.fr> on 2016-08-31
Reviewed by Xabier Rodriguez-Calvar.
LayoutTests/imported/w3c:
Changed 2 expectations, 1 that passes thanks to patch, the other that
now fails as getReader() has 1 parameter (0 expected, bug to be filed).
* web-platform-tests/streams/readable-streams/general.https-expected.txt:
* web-platform-tests/streams/readable-streams/templated.https-expected.txt:
Source/WebCore:
Aligned getReader() with spec following replacement of ReadableStreamReader by
ReadableStreamDefaultReader.
Test: streams/readable-stream-getReader.html
* Modules/streams/ReadableStream.js:
(getReader):
LayoutTests:
* streams/readable-stream-getReader-expected.txt: Added.
* streams/readable-stream-getReader.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablestreamsgeneralhttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/general.https-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablestreamstemplatedhttpsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/templated.https-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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstreamsreadablestreamgetReaderexpectedtxt">trunk/LayoutTests/streams/readable-stream-getReader-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreamgetReaderhtml">trunk/LayoutTests/streams/readable-stream-getReader.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205247 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
+++ trunk/LayoutTests/ChangeLog 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-31 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Streams API] Align getReader() with spec
+ https://bugs.webkit.org/show_bug.cgi?id=160508
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * streams/readable-stream-getReader-expected.txt: Added.
+ * streams/readable-stream-getReader.html: Added.
+
</ins><span class="cx"> 2016-08-31 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r201701): Unable to copy from CodeMirror editor version used in Jenkins install website
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (205247 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-31 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Streams API] Align getReader() with spec
+ https://bugs.webkit.org/show_bug.cgi?id=160508
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Changed 2 expectations, 1 that passes thanks to patch, the other that
+ now fails as getReader() has 1 parameter (0 expected, bug to be filed).
+
+ * web-platform-tests/streams/readable-streams/general.https-expected.txt:
+ * web-platform-tests/streams/readable-streams/templated.https-expected.txt:
+
</ins><span class="cx"> 2016-08-30 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Blob not found URL should result in a network error
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablestreamsgeneralhttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/general.https-expected.txt (205247 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/general.https-expected.txt 2016-08-31 14:38:21 UTC (rev 205247)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/general.https-expected.txt 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> PASS ReadableStream can be constructed with no errors
</span><span class="cx"> PASS ReadableStream can't be constructed with garbage
</span><span class="cx"> FAIL ReadableStream can't be constructed with an invalid type assert_throws: constructor should throw when the type is null function "() => new ReadableStream({ type: null })" did not throw
</span><del>-PASS ReadableStream instances should have the correct list of properties
</del><ins>+FAIL ReadableStream instances should have the correct list of properties assert_equals: getReader should have no parameters expected 0 but got 1
</ins><span class="cx"> PASS ReadableStream constructor should throw for non-function start arguments
</span><span class="cx"> PASS ReadableStream constructor can get initial garbage as cancel argument
</span><span class="cx"> PASS ReadableStream constructor can get initial garbage as pull argument
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> PASS ReadableStream can be constructed with no errors
</span><span class="cx"> PASS ReadableStream can't be constructed with garbage
</span><span class="cx"> FAIL ReadableStream can't be constructed with an invalid type assert_throws: constructor should throw when the type is null function "() => new ReadableStream({ type: null })" did not throw
</span><del>-PASS ReadableStream instances should have the correct list of properties
</del><ins>+FAIL ReadableStream instances should have the correct list of properties assert_equals: getReader should have no parameters expected 0 but got 1
</ins><span class="cx"> PASS ReadableStream constructor should throw for non-function start arguments
</span><span class="cx"> PASS ReadableStream constructor can get initial garbage as cancel argument
</span><span class="cx"> PASS ReadableStream constructor can get initial garbage as pull argument
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablestreamstemplatedhttpsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/templated.https-expected.txt (205247 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/templated.https-expected.txt 2016-08-31 14:38:21 UTC (rev 205247)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-streams/templated.https-expected.txt 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx">
</span><span class="cx"> PASS Running templatedRSEmpty with ReadableStream (empty)
</span><span class="cx"> PASS instances have the correct methods and properties
</span><del>-FAIL calling getReader with invalid arguments should throw appropriate errors assert_throws: empty string mode should throw function "() => rs.getReader({ mode: '' })" did not throw
</del><ins>+PASS calling getReader with invalid arguments should throw appropriate errors
</ins><span class="cx"> PASS Running templatedRSEmptyReader with ReadableStream (empty) reader
</span><span class="cx"> PASS instances have the correct methods and properties
</span><span class="cx"> PASS locked should be true
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> FAIL Untitled undefined is not an object (evaluating 'navigator.serviceWorker.getRegistration')
</span><span class="cx"> PASS Running templatedRSEmpty with ReadableStream (empty)
</span><span class="cx"> PASS instances have the correct methods and properties
</span><del>-FAIL calling getReader with invalid arguments should throw appropriate errors assert_throws: empty string mode should throw function "() => rs.getReader({ mode: '' })" did not throw
</del><ins>+PASS calling getReader with invalid arguments should throw appropriate errors
</ins><span class="cx"> PASS Running templatedRSEmptyReader with ReadableStream (empty) reader
</span><span class="cx"> PASS instances have the correct methods and properties
</span><span class="cx"> PASS locked should be true
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreamgetReaderexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/streams/readable-stream-getReader-expected.txt (0 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-getReader-expected.txt (rev 0)
+++ trunk/LayoutTests/streams/readable-stream-getReader-expected.txt 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+
+PASS getReader() should return a ReadableStreamDefaultReader
+PASS getReader({mode: 'byob'}) should return a TypeError as BYOB reader is not yet implemented
+PASS getReader({mode: 'aMode'}) should return a RangeError as 'aMode' is different from undefined and 'byob'
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreamgetReaderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/streams/readable-stream-getReader.html (0 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-getReader.html (rev 0)
+++ trunk/LayoutTests/streams/readable-stream-getReader.html 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<script src='../resources/testharness.js'></script>
+<script src='../resources/testharnessreport.js'></script>
+<script>
+// This is updated till https://github.com/whatwg/streams/commit/8d5f2ec3d74d501988e00b427468e11aa7855637
+
+test(function() {
+ const rs = new ReadableStream();
+ const reader = rs.getReader();
+ assert_equals(reader.constructor.name, 'ReadableStreamDefaultReader');
+}, 'getReader() should return a ReadableStreamDefaultReader');
+
+test(function() {
+ const rs = new ReadableStream();
+ assert_throws(new TypeError(), function() { rs.getReader({mode: 'byob'}) });
+}, "getReader({mode: 'byob'}) should return a TypeError as BYOB reader is not yet implemented");
+
+test(function() {
+ const rs = new ReadableStream();
+ // Any value different from undefined and 'byob' should throw a TypeError.
+ assert_throws(new RangeError(), function() { rs.getReader({mode : 'aMode'}) });
+}, "getReader({mode: 'aMode'}) should return a RangeError as 'aMode' is different from undefined and 'byob'");
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205247 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
+++ trunk/Source/WebCore/ChangeLog 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-31 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Streams API] Align getReader() with spec
+ https://bugs.webkit.org/show_bug.cgi?id=160508
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Aligned getReader() with spec following replacement of ReadableStreamReader by
+ ReadableStreamDefaultReader.
+
+ Test: streams/readable-stream-getReader.html
+
+ * Modules/streams/ReadableStream.js:
+ (getReader):
+
</ins><span class="cx"> 2016-08-31 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WK2 Gamepad provider on iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (205247 => 205248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2016-08-31 14:38:21 UTC (rev 205247)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2016-08-31 15:36:32 UTC (rev 205248)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return @cancelReadableStream(this, reason);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function getReader()
</del><ins>+function getReader(options)
</ins><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,18 @@
</span><span class="cx"> if (!@isReadableStream(this))
</span><span class="cx"> throw @makeThisTypeError("ReadableStream", "getReader");
</span><span class="cx">
</span><del>- return new @ReadableStreamDefaultReader(this);
</del><ins>+ if (options === @undefined)
+ options = { };
+
+ if (options.mode === 'byob') {
+ // FIXME: Update once ReadableByteStreamContoller and ReadableStreamBYOBReader are implemented.
+ throw new @TypeError("ReadableStreamBYOBReader is not implemented");
+ }
+
+ if (options.mode === @undefined)
+ return new @ReadableStreamDefaultReader(this);
+
+ throw new @RangeError("Invalid mode is specified");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function pipeThrough(streams, options)
</span></span></pre>
</div>
</div>
</body>
</html>