<!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>[192207] 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/192207">192207</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-10 00:51:03 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Shield promises when prototype is replaced from a promise
https://bugs.webkit.org/show_bug.cgi?id=151033
Reviewed by Darin Adler.
Source/WebCore:
Instead of calling @then or @catch, that could have disappeared if the user successfully replaces a promise
constructor, we call the methods stored at @Promise.prototype, which are safe as @Promise.prototype.@then.@call
and @Promise.prototype.@catch.@call.
Test: streams/streams-promises.html, expectations updated.
* Modules/streams/ReadableStream.js:
(initializeReadableStream):
* Modules/streams/ReadableStreamInternals.js:
(teeReadableStream):
(teeReadableStreamPullFunction):
(teeReadableStreamBranch2CancelFunction):
(cancelReadableStream):
* Modules/streams/WritableStream.js:
(initializeWritableStream):
(abort):
* Modules/streams/WritableStreamInternals.js:
(callOrScheduleWritableStreamAdvanceQueue):
LayoutTests:
* streams/streams-promises-expected.txt: Updated expectations.</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="#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>
<li><a href="#trunkSourceWebCoreModulesstreamsWritableStreamjs">trunk/Source/WebCore/Modules/streams/WritableStream.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/LayoutTests/ChangeLog 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-11-10 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Shield promises when prototype is replaced from a promise
+ https://bugs.webkit.org/show_bug.cgi?id=151033
+
+ Reviewed by Darin Adler.
+
+ * streams/streams-promises-expected.txt: Updated expectations.
+
</ins><span class="cx"> 2015-11-10 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r189567): Inline controls on Mac are misplaced
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromisesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/streams-promises-expected.txt (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises-expected.txt 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/LayoutTests/streams/streams-promises-expected.txt 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> PASS Streams and promises: replace Promise constructor
</span><span class="cx"> PASS Streams and promises: replace Promise.resolve
</span><span class="cx"> PASS Streams and promises: replace Promise.reject
</span><del>-FAIL Streams and promises: replace prototype of a promise object undefined is not a function
</del><ins>+PASS Streams and promises: replace prototype of a promise object
</ins><span class="cx"> PASS Streams and promises: replace then method in Promise prototype
</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></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/Source/WebCore/ChangeLog 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-11-10 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Shield promises when prototype is replaced from a promise
+ https://bugs.webkit.org/show_bug.cgi?id=151033
+
+ Reviewed by Darin Adler.
+
+ Instead of calling @then or @catch, that could have disappeared if the user successfully replaces a promise
+ constructor, we call the methods stored at @Promise.prototype, which are safe as @Promise.prototype.@then.@call
+ and @Promise.prototype.@catch.@call.
+
+ Test: streams/streams-promises.html, expectations updated.
+
+ * Modules/streams/ReadableStream.js:
+ (initializeReadableStream):
+ * Modules/streams/ReadableStreamInternals.js:
+ (teeReadableStream):
+ (teeReadableStreamPullFunction):
+ (teeReadableStreamBranch2CancelFunction):
+ (cancelReadableStream):
+ * Modules/streams/WritableStream.js:
+ (initializeWritableStream):
+ (abort):
+ * Modules/streams/WritableStreamInternals.js:
+ (callOrScheduleWritableStreamAdvanceQueue):
+
</ins><span class="cx"> 2015-11-10 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r189567): Inline controls on Mac are misplaced
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> var result = @invokeOrNoop(underlyingSource, "start", [this.@controller]);
</span><span class="cx"> var _this = this;
</span><del>- @Promise.@resolve(result).@then(function() {
</del><ins>+ @Promise.prototype.@then.@call(@Promise.@resolve(result), function() {
</ins><span class="cx"> _this.@started = true;
</span><span class="cx"> @requestReadableStreamPull(_this);
</span><span class="cx"> }, function(error) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> let branch1 = new ReadableStream(underlyingSource1);
</span><span class="cx"> let branch2 = new ReadableStream(underlyingSource2);
</span><span class="cx">
</span><del>- reader.closed.@catch(function(e) {
</del><ins>+ @Promise.prototype.@catch.@call(reader.closed, function(e) {
</ins><span class="cx"> if (teeState.closedOrErrored)
</span><span class="cx"> return;
</span><span class="cx"> @errorReadableStream(branch1, e);
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> function teeReadableStreamPullFunction(teeState, reader, shouldClone)
</span><span class="cx"> {
</span><span class="cx"> return function() {
</span><del>- reader.read().@then(function(result) {
</del><ins>+ @Promise.prototype.@then.@call(reader.read(), function(result) {
</ins><span class="cx"> if (result.done && !teeState.closedOrErrored) {
</span><span class="cx"> @closeReadableStream(teeState.branch1);
</span><span class="cx"> @closeReadableStream(teeState.branch2);
</span><span class="lines">@@ -150,8 +150,9 @@
</span><span class="cx"> teeState.canceled1 = true;
</span><span class="cx"> teeState.reason1 = r;
</span><span class="cx"> if (teeState.canceled2) {
</span><del>- @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).then(teeState.cancelPromiseCapability.@resolve,
- teeState.cancelPromiseCapability.@reject);
</del><ins>+ @Promise.prototype.@then.@call(@cancelReadableStream(stream, [teeState.reason1, teeState.reason2]),
+ teeState.cancelPromiseCapability.@resolve,
+ teeState.cancelPromiseCapability.@reject);
</ins><span class="cx"> }
</span><span class="cx"> return teeState.cancelPromiseCapability.@promise;
</span><span class="cx"> }
</span><span class="lines">@@ -163,8 +164,9 @@
</span><span class="cx"> teeState.canceled2 = true;
</span><span class="cx"> teeState.reason2 = r;
</span><span class="cx"> if (teeState.canceled1) {
</span><del>- @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).then(teeState.cancelPromiseCapability.@resolve,
- teeState.cancelPromiseCapability.@reject);
</del><ins>+ @Promise.prototype.@then.@call(@cancelReadableStream(stream, [teeState.reason1, teeState.reason2]),
+ teeState.cancelPromiseCapability.@resolve,
+ teeState.cancelPromiseCapability.@reject);
</ins><span class="cx"> }
</span><span class="cx"> return teeState.cancelPromiseCapability.@promise;
</span><span class="cx"> }
</span><span class="lines">@@ -237,7 +239,7 @@
</span><span class="cx"> stream.@pulling = true;
</span><span class="cx">
</span><span class="cx"> var promise = @promiseInvokeOrNoop(stream.@underlyingSource, "pull", [stream.@controller]);
</span><del>- promise.@then(function() {
</del><ins>+ @Promise.prototype.@then.@call(promise, function() {
</ins><span class="cx"> stream.@pulling = false;
</span><span class="cx"> if (stream.@pullAgain) {
</span><span class="cx"> stream.@pullAgain = false;
</span><span class="lines">@@ -281,7 +283,7 @@
</span><span class="cx"> return @Promise.@reject(stream.@storedError);
</span><span class="cx"> stream.@queue = @newQueue();
</span><span class="cx"> @finishClosingReadableStream(stream);
</span><del>- return @promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]).@then(function() { });
</del><ins>+ return @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]), function() { });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishClosingReadableStream(stream)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStream.js (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> var startResult = @invokeOrNoop(underlyingSink, "start", [error]);
</span><span class="cx"> this.@startedPromise = @Promise.@resolve(startResult);
</span><span class="cx"> var _this = this;
</span><del>- this.@startedPromise.@then(function() {
</del><ins>+ @Promise.prototype.@then.@call(this.@startedPromise, function() {
</ins><span class="cx"> _this.@started = true;
</span><span class="cx"> _this.@startedPromise = undefined;
</span><span class="cx"> }, error);
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> const sinkAbortPromise = @promiseInvokeOrFallbackOrNoop(this.@underlyingSink, "abort", [reason], "close", []);
</span><span class="cx">
</span><del>- return sinkAbortPromise.@then(function() { return undefined; });
</del><ins>+ return @Promise.prototype.@then.@call(sinkAbortPromise, function() { return undefined; });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function close()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (192206 => 192207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-10 08:49:30 UTC (rev 192206)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-10 08:51:03 UTC (rev 192207)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> function callOrScheduleWritableStreamAdvanceQueue(stream)
</span><span class="cx"> {
</span><span class="cx"> if (!stream.@started)
</span><del>- stream.@startedPromise.@then(function() { @writableStreamAdvanceQueue(stream); });
</del><ins>+ @Promise.prototype.@then.@call(stream.@startedPromise, function() { @writableStreamAdvanceQueue(stream); });
</ins><span class="cx"> else
</span><span class="cx"> @writableStreamAdvanceQueue(stream);
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stream.@writing = true;
</span><del>- @promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]).@then(
</del><ins>+ @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]),
</ins><span class="cx"> function() {
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="cx"> return;
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> function closeWritableStream(stream)
</span><span class="cx"> {
</span><span class="cx"> @assert(stream.@state === @streamClosing);
</span><del>- @promiseInvokeOrNoop(stream.@underlyingSink, "close").@then(
</del><ins>+ @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSink, "close"),
</ins><span class="cx"> function() {
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>