<!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>[194035] trunk/Source/WebCore</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/194035">194035</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-12-14 09:27:27 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Directly use @then as much as possible
https://bugs.webkit.org/show_bug.cgi?id=151631
Reviewed by Darin Adler.
Moved from @Promise.prototype.@then.@call(promise,...) to promise.@then.(...)
for promise objects that are not exposed to user scripts.
Updated promiseInvokeXX stream utility functions to ensure that returned promise always has a @then.
This allows improving the readability of code calling promiseInvokeXX functions.
Changed invokeOrNoop to promiseInvokeOrNoopNoCatch as invokeOrNoop
result is always wrapped as a promise using Promise.resolve.
No change in behavior.
* Modules/streams/ReadableStream.js:
(initializeReadableStream):
* Modules/streams/ReadableStreamInternals.js:
(teeReadableStream):
(teeReadableStreamBranch2CancelFunction):
(cancelReadableStream):
* Modules/streams/StreamInternals.js:
(shieldingPromiseResolve): introduced this routine to ensure the returned promise has a @then property.
(promiseInvokeOrNoopNoCatch):
(promiseInvokeOrNoop):
(promiseInvokeOrFallbackOrNoop):
* Modules/streams/WritableStream.js:
(initializeWritableStream):
(abort):
* Modules/streams/WritableStreamInternals.js:
(callOrScheduleWritableStreamAdvanceQueue):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreModulesstreamsStreamInternalsjs">trunk/Source/WebCore/Modules/streams/StreamInternals.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194034 => 194035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-14 16:27:42 UTC (rev 194034)
+++ trunk/Source/WebCore/ChangeLog 2015-12-14 17:27:27 UTC (rev 194035)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-12-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Directly use @then as much as possible
+ https://bugs.webkit.org/show_bug.cgi?id=151631
+
+ Reviewed by Darin Adler.
+
+ Moved from @Promise.prototype.@then.@call(promise,...) to promise.@then.(...)
+ for promise objects that are not exposed to user scripts.
+
+ Updated promiseInvokeXX stream utility functions to ensure that returned promise always has a @then.
+ This allows improving the readability of code calling promiseInvokeXX functions.
+ Changed invokeOrNoop to promiseInvokeOrNoopNoCatch as invokeOrNoop
+ result is always wrapped as a promise using Promise.resolve.
+
+ No change in behavior.
+
+ * Modules/streams/ReadableStream.js:
+ (initializeReadableStream):
+ * Modules/streams/ReadableStreamInternals.js:
+ (teeReadableStream):
+ (teeReadableStreamBranch2CancelFunction):
+ (cancelReadableStream):
+ * Modules/streams/StreamInternals.js:
+ (shieldingPromiseResolve): introduced this routine to ensure the returned promise has a @then property.
+ (promiseInvokeOrNoopNoCatch):
+ (promiseInvokeOrNoop):
+ (promiseInvokeOrFallbackOrNoop):
+ * Modules/streams/WritableStream.js:
+ (initializeWritableStream):
+ (abort):
+ * Modules/streams/WritableStreamInternals.js:
+ (callOrScheduleWritableStreamAdvanceQueue):
+
</ins><span class="cx"> 2015-12-14 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Expose ReadableStream and relatives to Worker
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (194034 => 194035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-12-14 16:27:42 UTC (rev 194034)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-12-14 17:27:27 UTC (rev 194035)
</span><span class="lines">@@ -55,8 +55,7 @@
</span><span class="cx"> this.@controller = new @ReadableStreamController(this);
</span><span class="cx"> this.@strategy = @validateAndNormalizeQueuingStrategy(strategy.size, strategy.highWaterMark);
</span><span class="cx">
</span><del>- const result = @invokeOrNoop(underlyingSource, "start", [this.@controller]);
- @Promise.prototype.@then.@call(@Promise.@resolve(result), () => {
</del><ins>+ @promiseInvokeOrNoopNoCatch(underlyingSource, "start", [this.@controller]).@then(() => {
</ins><span class="cx"> this.@started = true;
</span><span class="cx"> @requestReadableStreamPull(this);
</span><span class="cx"> }, (error) => {
</span><span class="lines">@@ -104,8 +103,9 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // We are not shielding against methods and attributes of the reader and destination as those objects don't have to
- // be necessarily ReadableStreamReader and WritableStream.
</del><ins>+ // FIXME: rewrite pipeTo so as to require to have 'this' as a ReadableStream and destination be a WritableStream.
+ // See https://github.com/whatwg/streams/issues/407.
+ // We should shield the pipeTo implementation at the same time.
</ins><span class="cx">
</span><span class="cx"> const preventClose = @isObject(options) && !!options.preventClose;
</span><span class="cx"> const preventAbort = @isObject(options) && !!options.preventAbort;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (194034 => 194035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-14 16:27:42 UTC (rev 194034)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-12-14 17:27:27 UTC (rev 194035)
</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.@then.@call(reader.closed, undefined, function(e) {
</del><ins>+ reader.@closedPromiseCapability.@promise.@then(undefined, 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">@@ -146,9 +146,9 @@
</span><span class="cx"> teeState.canceled1 = true;
</span><span class="cx"> teeState.reason1 = r;
</span><span class="cx"> if (teeState.canceled2) {
</span><del>- @Promise.prototype.@then.@call(@cancelReadableStream(stream, [teeState.reason1, teeState.reason2]),
- teeState.cancelPromiseCapability.@resolve,
- teeState.cancelPromiseCapability.@reject);
</del><ins>+ @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).@then(
+ 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">@@ -162,9 +162,9 @@
</span><span class="cx"> teeState.canceled2 = true;
</span><span class="cx"> teeState.reason2 = r;
</span><span class="cx"> if (teeState.canceled1) {
</span><del>- @Promise.prototype.@then.@call(@cancelReadableStream(stream, [teeState.reason1, teeState.reason2]),
- teeState.cancelPromiseCapability.@resolve,
- teeState.cancelPromiseCapability.@reject);
</del><ins>+ @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).@then(
+ 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">@@ -234,8 +234,7 @@
</span><span class="cx">
</span><span class="cx"> stream.@pulling = true;
</span><span class="cx">
</span><del>- const promise = @promiseInvokeOrNoop(stream.@underlyingSource, "pull", [stream.@controller]);
- @Promise.prototype.@then.@call(promise, function() {
</del><ins>+ @promiseInvokeOrNoop(stream.@underlyingSource, "pull", [stream.@controller]).@then(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">@@ -273,7 +272,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 @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]), function() { });
</del><ins>+ return @promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]).@then(function() { });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishClosingReadableStream(stream)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/StreamInternals.js (194034 => 194035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-12-14 16:27:42 UTC (rev 194034)
+++ trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-12-14 17:27:27 UTC (rev 194035)
</span><span class="lines">@@ -27,14 +27,22 @@
</span><span class="cx"> // @conditional=ENABLE(STREAMS_API)
</span><span class="cx"> // @internal
</span><span class="cx">
</span><del>-function invokeOrNoop(object, key, args)
</del><ins>+function shieldingPromiseResolve(result)
</ins><span class="cx"> {
</span><ins>+ const promise = @Promise.@resolve(result);
+ if (promise.@then === undefined)
+ promise.@then = @Promise.prototype.@then;
+ return promise;
+}
+
+function promiseInvokeOrNoopNoCatch(object, key, args)
+{
</ins><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> const method = object[key];
</span><del>- if (typeof method === "undefined")
- return;
- return method.@apply(object, args);
</del><ins>+ if (method === undefined)
+ return @Promise.@resolve();
+ return @shieldingPromiseResolve(method.@apply(object, args));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function promiseInvokeOrNoop(object, key, args)
</span><span class="lines">@@ -42,10 +50,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- const method = object[key];
- if (typeof method === "undefined")
- return @Promise.@resolve();
- return @Promise.@resolve(method.@apply(object, args));
</del><ins>+ return @promiseInvokeOrNoopNoCatch(object, key, args);
</ins><span class="cx"> }
</span><span class="cx"> catch(error) {
</span><span class="cx"> return @Promise.@reject(error);
</span><span class="lines">@@ -59,9 +64,9 @@
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> const method = object[key1];
</span><del>- if (typeof method === "undefined")
- return @promiseInvokeOrNoop(object, key2, args2);
- return @Promise.@resolve(method.@apply(object, args1));
</del><ins>+ if (method === undefined)
+ return @promiseInvokeOrNoopNoCatch(object, key2, args2);
+ return @shieldingPromiseResolve(method.@apply(object, args1));
</ins><span class="cx"> }
</span><span class="cx"> catch(error) {
</span><span class="cx"> return @Promise.@reject(error);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStream.js (194034 => 194035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-12-14 16:27:42 UTC (rev 194034)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-12-14 17:27:27 UTC (rev 194035)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx"> const errorFunction = (e) => {
</span><span class="cx"> @errorWritableStream(this, e);
</span><span class="cx"> };
</span><del>- this.@startedPromise = @Promise.@resolve(@invokeOrNoop(underlyingSink, "start", [errorFunction]));
- @Promise.prototype.@then.@call(this.@startedPromise, () => {
</del><ins>+ this.@startedPromise = @promiseInvokeOrNoopNoCatch(underlyingSink, "start", [errorFunction]);
+ this.@startedPromise.@then(() => {
</ins><span class="cx"> this.@started = true;
</span><span class="cx"> this.@startedPromise = undefined;
</span><span class="cx"> }, errorFunction);
</span><span class="lines">@@ -80,9 +80,7 @@
</span><span class="cx">
</span><span class="cx"> @errorWritableStream(this, reason);
</span><span class="cx">
</span><del>- const sinkAbortPromise = @promiseInvokeOrFallbackOrNoop(this.@underlyingSink, "abort", [reason], "close", []);
-
- return @Promise.prototype.@then.@call(sinkAbortPromise, function() { });
</del><ins>+ return @promiseInvokeOrFallbackOrNoop(this.@underlyingSink, "abort", [reason], "close", []).@then(function() { });
</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 (194034 => 194035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-12-14 16:27:42 UTC (rev 194034)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-12-14 17:27:27 UTC (rev 194035)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!stream.@started)
</span><del>- @Promise.prototype.@then.@call(stream.@startedPromise, function() { @writableStreamAdvanceQueue(stream); });
</del><ins>+ stream.@startedPromise.@then(function() { @writableStreamAdvanceQueue(stream); });
</ins><span class="cx"> else
</span><span class="cx"> @writableStreamAdvanceQueue(stream);
</span><span class="cx"> }
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stream.@writing = true;
</span><del>- @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]),
</del><ins>+ @promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]).@then(
</ins><span class="cx"> function() {
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="cx"> return;
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> @assert(stream.@state === @streamClosing);
</span><del>- @Promise.prototype.@then.@call(@promiseInvokeOrNoop(stream.@underlyingSink, "close"),
</del><ins>+ @promiseInvokeOrNoop(stream.@underlyingSink, "close").@then(
</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>