<!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>[210862] 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/210862">210862</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-18 12:06:46 -0800 (Wed, 18 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] ReadableStream generic reader constructor does not need to call ReadableStream getReader
https://bugs.webkit.org/show_bug.cgi?id=167137
Patch by Youenn Fablet <youenn@apple.com> on 2017-01-18
Reviewed by Xabier Rodriguez-Calvar.
Source/WebCore:
Test: streams/shadowing-getReader.html
* bindings/js/JSReadableStreamPrivateConstructors.cpp:
(WebCore::constructJSReadableStreamDefaultReader): Using private constructor instead of getReader.
LayoutTests:
* streams/shadowing-getReader-expected.txt: Added.
* streams/shadowing-getReader.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamPrivateConstructorscpp">trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstreamsshadowinggetReaderexpectedtxt">trunk/LayoutTests/streams/shadowing-getReader-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsshadowinggetReaderhtml">trunk/LayoutTests/streams/shadowing-getReader.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210861 => 210862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-18 19:57:16 UTC (rev 210861)
+++ trunk/LayoutTests/ChangeLog 2017-01-18 20:06:46 UTC (rev 210862)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2017-01-18 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [Streams API] ReadableStream generic reader constructor does not need to call ReadableStream getReader
+ https://bugs.webkit.org/show_bug.cgi?id=167137
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * streams/shadowing-getReader-expected.txt: Added.
+ * streams/shadowing-getReader.html: Added.
+
+2017-01-18 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> Reject fetch promise in case of ReadableStream upload
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167145
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsshadowinggetReaderexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/streams/shadowing-getReader-expected.txt (0 => 210862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/shadowing-getReader-expected.txt (rev 0)
+++ trunk/LayoutTests/streams/shadowing-getReader-expected.txt 2017-01-18 20:06:46 UTC (rev 210862)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This test should run without throwing an exception.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS new readerConstructor(stream) instanceof readerConstructor is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstreamsshadowinggetReaderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/streams/shadowing-getReader.html (0 => 210862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/shadowing-getReader.html (rev 0)
+++ trunk/LayoutTests/streams/shadowing-getReader.html 2017-01-18 20:06:46 UTC (rev 210862)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+description("This test should run without throwing an exception.");
+
+var readerConstructor = new ReadableStream().getReader().constructor;
+
+var stream = new ReadableStream();
+stream.getReader = "foo";
+
+shouldBeTrue("new readerConstructor(stream) instanceof readerConstructor");
+
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210861 => 210862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-18 19:57:16 UTC (rev 210861)
+++ trunk/Source/WebCore/ChangeLog 2017-01-18 20:06:46 UTC (rev 210862)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2017-01-18 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [Streams API] ReadableStream generic reader constructor does not need to call ReadableStream getReader
+ https://bugs.webkit.org/show_bug.cgi?id=167137
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Test: streams/shadowing-getReader.html
+
+ * bindings/js/JSReadableStreamPrivateConstructors.cpp:
+ (WebCore::constructJSReadableStreamDefaultReader): Using private constructor instead of getReader.
+
+2017-01-18 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> Reject fetch promise in case of ReadableStream upload
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167145
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamPrivateConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp (210861 => 210862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp 2017-01-18 19:57:16 UTC (rev 210861)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp 2017-01-18 20:06:46 UTC (rev 210862)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "JSReadableStreamDefaultReader.h"
</span><span class="cx"> #include "ReadableByteStreamInternalsBuiltins.h"
</span><span class="cx"> #include "ReadableStreamInternalsBuiltins.h"
</span><del>-#include <runtime/CallData.h>
</del><ins>+#include "WebCoreJSClientData.h"
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -56,19 +56,17 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL constructJSReadableStreamDefaultReader(ExecState& exec)
</span><span class="cx"> {
</span><del>- VM& vm = exec.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
</del><ins>+ JSVMClientData& clientData = *static_cast<JSVMClientData*>(exec.vm().clientData);
+ JSDOMGlobalObject& globalObject = *static_cast<JSDOMGlobalObject*>(exec.lexicalGlobalObject());
</ins><span class="cx">
</span><del>- JSReadableStream* stream = jsDynamicDowncast<JSReadableStream*>(exec.argument(0));
- if (!stream)
- return throwArgumentTypeError(exec, scope, 0, "stream", "ReadableStreamReader", nullptr, "ReadableStream");
</del><ins>+ JSC::JSObject* constructor = JSC::asObject(globalObject.get(&exec, clientData.builtinNames().ReadableStreamDefaultReaderPrivateName()));
+ ConstructData constructData;
+ ConstructType constructType = constructor->methodTable()->getConstructData(constructor, constructData);
+ ASSERT(constructType != ConstructType::None);
</ins><span class="cx">
</span><del>- JSValue jsFunction = stream->get(&exec, Identifier::fromString(&exec, "getReader"));
-
- CallData callData;
- CallType callType = getCallData(jsFunction, callData);
- MarkedArgumentBuffer noArguments;
- return JSValue::encode(call(&exec, jsFunction, callType, callData, stream, noArguments));
</del><ins>+ MarkedArgumentBuffer args;
+ args.append(exec.argument(0));
+ return JSValue::encode(JSC::construct(&exec, constructor, constructType, constructData, args));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private JS ReadableStreamDefaultReader and ReadableStreamDefaultController constructors.
</span></span></pre>
</div>
</div>
</body>
</html>