<!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>[192865] 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/192865">192865</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-12-01 00:15:45 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Remove use of @catch for exposed promises
https://bugs.webkit.org/show_bug.cgi?id=151625
Reviewed by Darin Adler.
Source/JavaScriptCore:
* runtime/JSPromisePrototype.cpp:
(JSC::JSPromisePrototype::addOwnInternalSlots): Removing @catch from the prototype as it is not safe.
Source/WebCore:
Promise @catch is calling "then" which may be controlled by user scripts.
This patch simply replaces @catch by calling @then directly.
Covered by modified tests.
* Modules/streams/ReadableStream.js:
(pipeTo):
* Modules/streams/ReadableStreamInternals.js:
(teeReadableStream):
LayoutTests:
* streams/streams-promises.html: beefing up the catch test by also overwritting Promise.prototype.then.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsstreamspromiseshtml">trunk/LayoutTests/streams/streams-promises.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPromisePrototypecpp">trunk/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp</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>
<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 (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/LayoutTests/ChangeLog 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Remove use of @catch for exposed promises
+ https://bugs.webkit.org/show_bug.cgi?id=151625
+
+ Reviewed by Darin Adler.
+
+ * streams/streams-promises.html: beefing up the catch test by also overwritting Promise.prototype.then.
+
</ins><span class="cx"> 2015-11-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Unskip "storage/indexeddb/mozilla" instead of each individual test inside of it.
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromiseshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/streams-promises.html (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises.html 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/LayoutTests/streams/streams-promises.html 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -66,14 +66,17 @@
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="cx"> const PromiseCatchBackup = Promise.prototype.catch;
</span><ins>+ const PromiseThenBackup = Promise.prototype.then;
</ins><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> Promise.prototype.catch = function() { assert_unreached("streams should not use this Promise.prototype.catch method"); };
</span><ins>+ Promise.prototype.then = function() { assert_unreached("streams should not use this Promise.prototype.catch method"); };
</ins><span class="cx">
</span><span class="cx"> const rs = new ReadableStream();
</span><span class="cx"> rs.tee();
</span><span class="cx"> } finally {
</span><span class="cx"> Promise.prototype.catch = PromiseCatchBackup;
</span><ins>+ Promise.prototype.then = PromiseThenBackup;
</ins><span class="cx"> }
</span><span class="cx"> }, 'Streams and promises: replace catch method in Promise prototype');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Remove use of @catch for exposed promises
+ https://bugs.webkit.org/show_bug.cgi?id=151625
+
+ Reviewed by Darin Adler.
+
+ * runtime/JSPromisePrototype.cpp:
+ (JSC::JSPromisePrototype::addOwnInternalSlots): Removing @catch from the prototype as it is not safe.
+
</ins><span class="cx"> 2015-11-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3::ValueRep::Any should translate into a Arg::ColdUse role in Air
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPromisePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -83,7 +83,6 @@
</span><span class="cx"> void JSPromisePrototype::addOwnInternalSlots(VM& vm, JSGlobalObject* globalObject)
</span><span class="cx"> {
</span><span class="cx"> JSC_BUILTIN_FUNCTION(vm.propertyNames->builtinNames().thenPrivateName(), promisePrototypeThenCodeGenerator, DontEnum | DontDelete | ReadOnly);
</span><del>- JSC_BUILTIN_FUNCTION(vm.propertyNames->builtinNames().catchPrivateName(), promisePrototypeCatchCodeGenerator, DontEnum | DontDelete | ReadOnly);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSPromisePrototype::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/Source/WebCore/ChangeLog 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Remove use of @catch for exposed promises
+ https://bugs.webkit.org/show_bug.cgi?id=151625
+
+ Reviewed by Darin Adler.
+
+ Promise @catch is calling "then" which may be controlled by user scripts.
+ This patch simply replaces @catch by calling @then directly.
+
+ Covered by modified tests.
+
+ * Modules/streams/ReadableStream.js:
+ (pipeTo):
+ * Modules/streams/ReadableStreamInternals.js:
+ (teeReadableStream):
+
</ins><span class="cx"> 2015-11-30 Jaehun Lim <ljaehun.lim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix build after r192848 and r192849
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> reader = source.getReader();
</span><span class="cx">
</span><del>- @Promise.prototype.@catch.@call(reader.closed, abortDestination);
</del><ins>+ @Promise.prototype.@then.@call(reader.closed, undefined, abortDestination);
</ins><span class="cx"> @Promise.prototype.@then.@call(destination.closed,
</span><span class="cx"> function() {
</span><span class="cx"> if (!closedPurposefully)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192864 => 192865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-01 08:07:45 UTC (rev 192864)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-01 08:15:45 UTC (rev 192865)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> "cancel": @teeReadableStreamBranch2CancelFunction(teeState, stream)
</span><span class="cx"> });
</span><span class="cx">
</span><del>- @Promise.prototype.@catch.@call(reader.closed, function(e) {
</del><ins>+ @Promise.prototype.@then.@call(reader.closed, undefined, function(e) {
</ins><span class="cx"> if (teeState.closedOrErrored)
</span><span class="cx"> return;
</span><span class="cx"> @errorReadableStream(branch1, e);
</span></span></pre>
</div>
</div>
</body>
</html>