<!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>[192879] 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/192879">192879</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-12-01 03:02:30 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] pull function of tee should call readFromReadableStreamReader directly
https://bugs.webkit.org/show_bug.cgi?id=151497
Source/WebCore:
Reviewed by Darin Adler.
Covered by added test.
* Modules/streams/ReadableStreamInternals.js:
(teeReadableStreamPullFunction): directly calling readFromReadableStreamReader.
LayoutTests:
Unreviewed.
Adding non regression test.
* streams/streams-promises-expected.txt:
* streams/streams-promises.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsstreamspromisesexpectedtxt">trunk/LayoutTests/streams/streams-promises-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsstreamspromiseshtml">trunk/LayoutTests/streams/streams-promises.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (192878 => 192879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-01 10:46:30 UTC (rev 192878)
+++ trunk/LayoutTests/ChangeLog 2015-12-01 11:02:30 UTC (rev 192879)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><ins>+ [Streams API] pull function of tee should call readFromReadableStreamReader directly
+ https://bugs.webkit.org/show_bug.cgi?id=151497
+
+ Unreviewed.
+
+ Adding non regression test.
+
+ * streams/streams-promises-expected.txt:
+ * streams/streams-promises.html:
+
+2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
</ins><span class="cx"> [Streams API] teeReadableStream should not directly use stream.getReader()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151487
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromisesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/streams-promises-expected.txt (192878 => 192879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises-expected.txt 2015-12-01 10:46:30 UTC (rev 192878)
+++ trunk/LayoutTests/streams/streams-promises-expected.txt 2015-12-01 11:02:30 UTC (rev 192879)
</span><span class="lines">@@ -8,4 +8,5 @@
</span><span class="cx"> PASS Streams and promises: replace then method in promise object
</span><span class="cx"> PASS Streams should not directly use Number and related methods
</span><span class="cx"> PASS Streams should not directly use ReadableStream public APIs
</span><ins>+PASS Streams should not directly use ReadableStreamReader read public API
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromiseshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/streams-promises.html (192878 => 192879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises.html 2015-12-01 10:46:30 UTC (rev 192878)
+++ trunk/LayoutTests/streams/streams-promises.html 2015-12-01 11:02:30 UTC (rev 192879)
</span><span class="lines">@@ -125,4 +125,28 @@
</span><span class="cx"> ReadableStream.prototype.getReader = ReadableStreamGetReaderBackup;
</span><span class="cx"> }
</span><span class="cx"> }, 'Streams should not directly use ReadableStream public APIs');
</span><ins>+
+promise_test(function() {
+ const ReadableStreamReader = new ReadableStream().getReader().constructor;
+ const ReadableStreamReaderReadBackup = ReadableStreamReader.prototype.read;
+
+ function cleanTest() {
+ ReadableStreamReader.prototype.read = ReadableStreamReaderReadBackup;
+ }
+
+ try {
+ ReadableStreamReader.prototype.read = function() { assert_unreached("streams should not use this ReadableStreamReader.read method"); };
+
+ [s1, s2] = new ReadableStream({
+ start: function(controller) {
+ controller.close();
+ }
+ }).tee();
+ return s1.getReader().closed.then(cleanTest, cleanTest);
+
+ } catch (error) {
+ cleanTest();
+ assert_unreached("test should not throw");
+ }
+}, 'Streams should not directly use ReadableStreamReader read public API');
</ins><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192878 => 192879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-01 10:46:30 UTC (rev 192878)
+++ trunk/Source/WebCore/ChangeLog 2015-12-01 11:02:30 UTC (rev 192879)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><ins>+ [Streams API] pull function of tee should call readFromReadableStreamReader directly
+ https://bugs.webkit.org/show_bug.cgi?id=151497
+
+ Reviewed by Darin Adler.
+
+ Covered by added test.
+
+ * Modules/streams/ReadableStreamInternals.js:
+ (teeReadableStreamPullFunction): directly calling readFromReadableStreamReader.
+
+2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
</ins><span class="cx"> [Streams API] Clean-up JS built-in code using arrow functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151489
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192878 => 192879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-01 10:46:30 UTC (rev 192878)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-01 11:02:30 UTC (rev 192879)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> return function() {
</span><del>- @Promise.prototype.@then.@call(reader.read(), function(result) {
</del><ins>+ @Promise.prototype.@then.@call(@readFromReadableStreamReader(reader), function(result) {
</ins><span class="cx"> @assert(@isObject(result));
</span><span class="cx"> @assert(typeof result.done === "boolean");
</span><span class="cx"> if (result.done && !teeState.closedOrErrored) {
</span></span></pre>
</div>
</div>
</body>
</html>