<!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>[192877] 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/192877">192877</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-12-01 02:14:04 -0800 (Tue, 01 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Streams API] teeReadableStream should not directly use stream.getReader()
https://bugs.webkit.org/show_bug.cgi?id=151487

Reviewed by Darin Adler.

Source/WebCore:

Covered by added test.

* Modules/streams/ReadableStreamInternals.js:
(teeReadableStream): Create a @ReadableStreamReader instead of calling getReader() which may be disrupted by user scripts.

LayoutTests:

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 (192876 => 192877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-12-01 09:46:12 UTC (rev 192876)
+++ trunk/LayoutTests/ChangeLog        2015-12-01 10:14:04 UTC (rev 192877)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-01  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
+
+        [Streams API] teeReadableStream should not directly use stream.getReader()
+        https://bugs.webkit.org/show_bug.cgi?id=151487
+
+        Reviewed by Darin Adler.
+
+        Adding non-regression test.
+
+        * streams/streams-promises-expected.txt:
+        * streams/streams-promises.html:
+
</ins><span class="cx"> 2015-12-01  Skachkov Oleksandr  &lt;gskachkov@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ES6] &quot;super&quot; and &quot;this&quot; should be lexically bound inside an arrow function and should live in a JSLexicalEnvironment
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromisesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/streams-promises-expected.txt (192876 => 192877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises-expected.txt        2015-12-01 09:46:12 UTC (rev 192876)
+++ trunk/LayoutTests/streams/streams-promises-expected.txt        2015-12-01 10:14:04 UTC (rev 192877)
</span><span class="lines">@@ -7,4 +7,5 @@
</span><span class="cx"> PASS Streams and promises: replace catch method in Promise prototype 
</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><ins>+PASS Streams should not directly use ReadableStream public APIs 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromiseshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/streams-promises.html (192876 => 192877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises.html        2015-12-01 09:46:12 UTC (rev 192876)
+++ trunk/LayoutTests/streams/streams-promises.html        2015-12-01 10:14:04 UTC (rev 192877)
</span><span class="lines">@@ -115,4 +115,14 @@
</span><span class="cx">         Number.isFinite = NumberIsFiniteBackup;
</span><span class="cx">     }
</span><span class="cx"> }, 'Streams should not directly use Number and related methods');
</span><ins>+test(function() {
+    const ReadableStreamGetReaderBackup = ReadableStream.prototype.getReader;
+
+    try {
+        ReadableStream.prototype.getReader = function() { assert_unreached(&quot;streams should not use this ReadableStream.getReader method&quot;); };
+        new ReadableStream().tee();
+    } finally {
+        ReadableStream.prototype.getReader = ReadableStreamGetReaderBackup;
+    }
+}, 'Streams should not directly use ReadableStream public APIs');
</ins><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192876 => 192877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-01 09:46:12 UTC (rev 192876)
+++ trunk/Source/WebCore/ChangeLog        2015-12-01 10:14:04 UTC (rev 192877)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-12-01  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><ins>+        [Streams API] teeReadableStream should not directly use stream.getReader()
+        https://bugs.webkit.org/show_bug.cgi?id=151487
+
+        Reviewed by Darin Adler.
+
+        Covered by added test.
+
+        * Modules/streams/ReadableStreamInternals.js:
+        (teeReadableStream): Create a @ReadableStreamReader instead of calling getReader() which may be disrupted by user scripts.
+
+2015-12-01  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
+
</ins><span class="cx">         [Streams API] streams should not directly use Number and related methods
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=151499
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192876 => 192877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js        2015-12-01 09:46:12 UTC (rev 192876)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js        2015-12-01 10:14:04 UTC (rev 192877)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">     @assert(@isReadableStream(stream));
</span><span class="cx">     @assert(typeof(shouldClone) === &quot;boolean&quot;);
</span><span class="cx"> 
</span><del>-    const reader = stream.getReader();
</del><ins>+    const reader = new @ReadableStreamReader(stream);
</ins><span class="cx"> 
</span><span class="cx">     const teeState = {
</span><span class="cx">         closedOrErrored: false,
</span></span></pre>
</div>
</div>

</body>
</html>