<!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>[191950] 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/191950">191950</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-03 06:52:04 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Rework promises to use @newPromiseCapability
https://bugs.webkit.org/show_bug.cgi?id=150627
Reviewed by Youenn Fablet.
We are removing the stream promises functions in favor of @newPromiseCapabity which basically provides the same
functionality (keeping the resolve and reject functions without external slots). Slots and variables were
renamed as *PromiseCapability to show that they no longer hold just a promise, but a promise capability.
Internal rework, no new tests needed.
* Modules/streams/ReadableStreamInternals.js:
(privateInitializeReadableStreamReader.this.closedPromiseCapability.resolve):
(privateInitializeReadableStreamReader.this.closedPromiseCapability.reject):
(privateInitializeReadableStreamReader):
(teeReadableStream):
(teeReadableStreamBranch2CancelFunction):
(errorReadableStream):
(closeReadableStreamReader):
(enqueueInReadableStream):
(readFromReadableStreamReader):
* Modules/streams/ReadableStreamReader.js:
(closed):
* Modules/streams/StreamInternals.js:
(createNewStreamsPromise): Deleted.
(resolveStreamsPromise): Deleted.
(rejectStreamsPromise): Deleted.
* Modules/streams/WritableStream.js:
(this.readyPromiseCapability.resolve):
(this.readyPromiseCapability.reject):
(initializeWritableStream):
(close):
(write):
(closed):
(ready):
* Modules/streams/WritableStreamInternals.js:
(syncWritableStreamStateWithQueue):
(errorWritableStream):
* bindings/js/WebCoreBuiltinNames.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReaderjs">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.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>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh">trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/ChangeLog 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-11-03 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Rework promises to use @newPromiseCapability
+ https://bugs.webkit.org/show_bug.cgi?id=150627
+
+ Reviewed by Youenn Fablet.
+
+ We are removing the stream promises functions in favor of @newPromiseCapabity which basically provides the same
+ functionality (keeping the resolve and reject functions without external slots). Slots and variables were
+ renamed as *PromiseCapability to show that they no longer hold just a promise, but a promise capability.
+
+ Internal rework, no new tests needed.
+
+ * Modules/streams/ReadableStreamInternals.js:
+ (privateInitializeReadableStreamReader.this.closedPromiseCapability.resolve):
+ (privateInitializeReadableStreamReader.this.closedPromiseCapability.reject):
+ (privateInitializeReadableStreamReader):
+ (teeReadableStream):
+ (teeReadableStreamBranch2CancelFunction):
+ (errorReadableStream):
+ (closeReadableStreamReader):
+ (enqueueInReadableStream):
+ (readFromReadableStreamReader):
+ * Modules/streams/ReadableStreamReader.js:
+ (closed):
+ * Modules/streams/StreamInternals.js:
+ (createNewStreamsPromise): Deleted.
+ (resolveStreamsPromise): Deleted.
+ (rejectStreamsPromise): Deleted.
+ * Modules/streams/WritableStream.js:
+ (this.readyPromiseCapability.resolve):
+ (this.readyPromiseCapability.reject):
+ (initializeWritableStream):
+ (close):
+ (write):
+ (closed):
+ (ready):
+ * Modules/streams/WritableStreamInternals.js:
+ (syncWritableStreamStateWithQueue):
+ (errorWritableStream):
+ * bindings/js/WebCoreBuiltinNames.h:
+
</ins><span class="cx"> 2015-11-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Move webkitGetUserMedia to JS Builtin
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -42,19 +42,19 @@
</span><span class="cx"> this.@ownerReadableStream = stream;
</span><span class="cx"> this.@storedError = undefined;
</span><span class="cx"> stream.@reader = this;
</span><del>- this.@closedPromise = @createNewStreamsPromise();
</del><ins>+ this.@closedPromiseCapability = @newPromiseCapability(Promise);
</ins><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx"> if (stream.@state === @streamClosed) {
</span><span class="cx"> this.@ownerReadableStream = null;
</span><span class="cx"> this.@storedError = undefined;
</span><del>- this.@closedPromise = Promise.resolve();
</del><ins>+ this.@closedPromiseCapability = { @promise: Promise.resolve(undefined), @resolve: function() {}, @reject: function() {} };
</ins><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx"> // FIXME: ASSERT(stream.@state === @streamErrored);
</span><span class="cx"> this.@ownerReadableStream = null;
</span><span class="cx"> this.@storedError = stream.@storedError;
</span><del>- this.@closedPromise = Promise.reject(stream.@storedError);
</del><ins>+ this.@closedPromiseCapability = { @promise: Promise.reject(stream.@storedError), @resolve: function() {}, @reject: function() {} };
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="lines">@@ -89,10 +89,7 @@
</span><span class="cx"> reason: undefined,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- teeState.cancelPromise = new @InternalPromise(function(resolve, reject) {
- teeState.resolvePromise = resolve;
- teeState.rejectPromise = reject;
- });
</del><ins>+ teeState.cancelPromiseCapability = @newPromiseCapability(@InternalPromise);
</ins><span class="cx">
</span><span class="cx"> let pullFunction = @teeReadableStreamPullFunction(teeState, reader, shouldClone);
</span><span class="cx">
</span><span class="lines">@@ -153,9 +150,10 @@
</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.resolvePromise, teeState.rejectPromise);
</del><ins>+ @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).then(teeState.cancelPromiseCapability.@resolve,
+ teeState.cancelPromiseCapability.@reject);
</ins><span class="cx"> }
</span><del>- return teeState.cancelPromise;
</del><ins>+ return teeState.cancelPromiseCapability.@promise;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,9 +163,10 @@
</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.resolvePromise, teeState.rejectPromise);
</del><ins>+ @cancelReadableStream(stream, [teeState.reason1, teeState.reason2]).then(teeState.cancelPromiseCapability.@resolve,
+ teeState.cancelPromiseCapability.@reject);
</ins><span class="cx"> }
</span><del>- return teeState.cancelPromise;
</del><ins>+ return teeState.cancelPromiseCapability.@promise;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -207,14 +206,14 @@
</span><span class="cx">
</span><span class="cx"> var requests = reader.@readRequests;
</span><span class="cx"> for (var index = 0, length = requests.length; index < length; ++index)
</span><del>- @rejectStreamsPromise(requests[index], error);
</del><ins>+ requests[index].@reject.@call(undefined, error);
</ins><span class="cx"> reader.@readRequests = [];
</span><span class="cx">
</span><span class="cx"> @releaseReadableStreamReader(reader);
</span><span class="cx"> reader.@storedError = error;
</span><span class="cx"> reader.@state = @streamErrored;
</span><span class="cx">
</span><del>- @rejectStreamsPromise(reader.@closedPromise, error);
</del><ins>+ reader.@closedPromiseCapability.@reject.@call(undefined, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function requestReadableStreamPull(stream)
</span><span class="lines">@@ -314,11 +313,11 @@
</span><span class="cx">
</span><span class="cx"> var requests = reader.@readRequests;
</span><span class="cx"> for (var index = 0, length = requests.length; index < length; ++index)
</span><del>- @resolveStreamsPromise(requests[index], {value:undefined, done: true});
</del><ins>+ requests[index].@resolve.@call(undefined, {value:undefined, done: true});
</ins><span class="cx"> reader.@readRequests = [];
</span><span class="cx"> @releaseReadableStreamReader(reader);
</span><span class="cx"> reader.@state = @streamClosed;
</span><del>- @resolveStreamsPromise(reader.@closedPromise);
</del><ins>+ reader.@closedPromiseCapability.@resolve.@call(undefined);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function enqueueInReadableStream(stream, chunk)
</span><span class="lines">@@ -330,7 +329,7 @@
</span><span class="cx"> if (stream.@state === @streamClosed)
</span><span class="cx"> return undefined;
</span><span class="cx"> if (@isReadableStreamLocked(stream) && stream.@reader.@readRequests.length) {
</span><del>- @resolveStreamsPromise(stream.@reader.@readRequests.shift(), {value: chunk, done: false});
</del><ins>+ stream.@reader.@readRequests.shift().@resolve.@call(undefined, {value: chunk, done: false});
</ins><span class="cx"> @requestReadableStreamPull(stream);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -369,8 +368,8 @@
</span><span class="cx"> @finishClosingReadableStream(stream);
</span><span class="cx"> return Promise.resolve({value: chunk, done: false});
</span><span class="cx"> }
</span><del>- var readPromise = @createNewStreamsPromise();
- reader.@readRequests.push(readPromise);
</del><ins>+ var readPromiseCapability = @newPromiseCapability(Promise);
+ reader.@readRequests.push(readPromiseCapability);
</ins><span class="cx"> @requestReadableStreamPull(stream);
</span><del>- return readPromise;
</del><ins>+ return readPromiseCapability.@promise;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -76,5 +76,5 @@
</span><span class="cx"> if (!@isReadableStreamReader(this))
</span><span class="cx"> return Promise.reject(new @TypeError("Callee of closed is not a ReadableStreamReader"));
</span><span class="cx">
</span><del>- return this.@closedPromise;
</del><ins>+ return this.@closedPromiseCapability.@promise;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/StreamInternals.js (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -90,43 +90,6 @@
</span><span class="cx"> return normalizedStrategy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function createNewStreamsPromise()
-{
- "use strict";
-
- var resolveFunction;
- var rejectFunction;
- var promise = new Promise(function(resolve, reject) {
- resolveFunction = resolve;
- rejectFunction = reject;
- });
- promise.@resolve = resolveFunction;
- promise.@reject = rejectFunction;
- return promise;
-}
-
-function resolveStreamsPromise(promise, value)
-{
- "use strict";
-
- if (promise && promise.@resolve) {
- promise.@resolve(value);
- promise.@resolve = undefined;
- promise.@reject = undefined;
- }
-}
-
-function rejectStreamsPromise(promise, value)
-{
- "use strict";
-
- if (promise && promise.@reject) {
- promise.@reject(value);
- promise.@resolve = undefined;
- promise.@reject = undefined;
- }
-}
-
</del><span class="cx"> function newQueue()
</span><span class="cx"> {
</span><span class="cx"> return { content: [], size: 0 };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStream.js (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> throw new @TypeError("WritableStream constructor takes an object as second argument, if any");
</span><span class="cx">
</span><span class="cx"> this.@underlyingSink = underlyingSink;
</span><del>- this.@closedPromise = @createNewStreamsPromise();
- this.@readyPromise = Promise.resolve(undefined);
</del><ins>+ this.@closedPromiseCapability = @newPromiseCapability(Promise);
+ this.@readyPromiseCapability = { @promise: Promise.resolve(undefined), @resolve: function() {}, @reject: function() {} };
</ins><span class="cx"> this.@queue = @newQueue();
</span><span class="cx"> this.@state = @streamWritable;
</span><span class="cx"> this.@started = false;
</span><span class="lines">@@ -99,13 +99,13 @@
</span><span class="cx"> return Promise.reject(this.@storedError);
</span><span class="cx">
</span><span class="cx"> if (this.@state === @streamWaiting)
</span><del>- @resolveStreamsPromise(this.@readyPromise, undefined);
</del><ins>+ this.@readyPromiseCapability.@resolve.@call(undefined, undefined);
</ins><span class="cx">
</span><span class="cx"> this.@state = @streamClosing;
</span><span class="cx"> @enqueueValueWithSize(this.@queue, "close", 0);
</span><span class="cx"> @callOrScheduleWritableStreamAdvanceQueue(this);
</span><span class="cx">
</span><del>- return this.@closedPromise;
</del><ins>+ return this.@closedPromiseCapability.@promise;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function write(chunk)
</span><span class="lines">@@ -134,9 +134,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const promise = @createNewStreamsPromise();
</del><ins>+ const promiseCapability = @newPromiseCapability(Promise);
</ins><span class="cx"> try {
</span><del>- @enqueueValueWithSize(this.@queue, { promise: promise, chunk: chunk }, chunkSize);
</del><ins>+ @enqueueValueWithSize(this.@queue, { promiseCapability: promiseCapability, chunk: chunk }, chunkSize);
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> @errorWritableStream.@call(this, e);
</span><span class="cx"> return Promise.reject(e);
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> @syncWritableStreamStateWithQueue(this);
</span><span class="cx"> @callOrScheduleWritableStreamAdvanceQueue(this);
</span><span class="cx">
</span><del>- return promise;
</del><ins>+ return promiseCapability.@promise;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function closed()
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> if (!@isWritableStream(this))
</span><span class="cx"> return Promise.reject(new @TypeError("The WritableStream.closed getter can only be used on instances of WritableStream"));
</span><span class="cx">
</span><del>- return this.@closedPromise;
</del><ins>+ return this.@closedPromiseCapability.@promise;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function ready()
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> if (!@isWritableStream(this))
</span><span class="cx"> return Promise.reject(new @TypeError("The WritableStream.ready getter can only be used on instances of WritableStream"));
</span><span class="cx">
</span><del>- return this.@readyPromise;
</del><ins>+ return this.@readyPromiseCapability.@promise;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function state()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -46,10 +46,10 @@
</span><span class="cx">
</span><span class="cx"> if (stream.@queue.size > stream.@strategy.highWaterMark) {
</span><span class="cx"> stream.@state = @streamWaiting;
</span><del>- stream.@readyPromise = @createNewStreamsPromise();
</del><ins>+ stream.@readyPromiseCapability = @newPromiseCapability(Promise);
</ins><span class="cx"> } else {
</span><span class="cx"> stream.@state = @streamWritable;
</span><del>- @resolveStreamsPromise(stream.@readyPromise, undefined);
</del><ins>+ stream.@readyPromiseCapability.@resolve.@call(undefined, undefined);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return undefined;
</span><span class="lines">@@ -63,13 +63,13 @@
</span><span class="cx"> return undefined;
</span><span class="cx"> while (this.@queue.content.length > 0) {
</span><span class="cx"> var writeRecord = @dequeueValue(this.@queue);
</span><del>- if (writeRecord !== "close" && writeRecord.promise)
- @rejectStreamsPromise(writeRecord.promise, e);
</del><ins>+ if (writeRecord !== "close")
+ writeRecord.promiseCapability.@reject.@call(undefined, e);
</ins><span class="cx"> }
</span><span class="cx"> this.@storedError = e;
</span><span class="cx"> if (this.@state === @streamWaiting)
</span><del>- @resolveStreamsPromise(this.@readyPromise, undefined);
- @rejectStreamsPromise(this.@closedPromise, e);
</del><ins>+ this.@readyPromiseCapability.@resolve.@call(undefined, undefined);
+ this.@closedPromiseCapability.@reject.@call(undefined, e);
</ins><span class="cx"> this.@state = @streamErrored;
</span><span class="cx"> return undefined;
</span><span class="cx"> }
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="cx"> return;
</span><span class="cx"> stream.@writing = false;
</span><del>- @resolveStreamsPromise(writeRecord.promise, undefined);
</del><ins>+ writeRecord.promiseCapability.@resolve.@call(undefined, undefined);
</ins><span class="cx"> @dequeueValue(stream.@queue);
</span><span class="cx"> @syncWritableStreamStateWithQueue(stream);
</span><span class="cx"> @writableStreamAdvanceQueue(stream);
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> return;
</span><span class="cx"> // FIXME
</span><span class="cx"> // assert(stream.@state === @streamClosing);
</span><del>- @resolveStreamsPromise(stream.@closedPromise, undefined);
</del><ins>+ stream.@closedPromiseCapability.@resolve.@call(undefined, undefined);
</ins><span class="cx"> stream.@state = @streamClosed;
</span><span class="cx"> },
</span><span class="cx"> function(r) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (191949 => 191950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2015-11-03 13:43:56 UTC (rev 191949)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2015-11-03 14:52:04 UTC (rev 191950)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #define WEBCORE_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(macro)\
</span><span class="cx"> macro(closeRequested) \
</span><del>- macro(closedPromise) \
</del><ins>+ macro(closedPromiseCapability) \
</ins><span class="cx"> macro(controlledReadableStream) \
</span><span class="cx"> macro(controller) \
</span><span class="cx"> macro(getUserMediaFromJS) \
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> macro(queue) \
</span><span class="cx"> macro(reader) \
</span><span class="cx"> macro(readRequests) \
</span><del>- macro(readyPromise) \
</del><ins>+ macro(readyPromiseCapability) \
</ins><span class="cx"> macro(state) \
</span><span class="cx"> macro(started) \
</span><span class="cx"> macro(startedPromise) \
</span></span></pre>
</div>
</div>
</body>
</html>