<!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>[192021] 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/192021">192021</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-04 03:15:51 -0800 (Wed, 04 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Shield streams against user replacing the Promise constructor
https://bugs.webkit.org/show_bug.cgi?id=150887
Reviewed by Youenn Fablet.
Source/WebCore:
With this rework, we shield the Streams implementation against the user doing something like "Promise =
function() { /* do garbage */ };".
Test: streams/streams-promises.html.
* Modules/streams/ReadableStream.js:
(initializeReadableStream):
(cancel):
* Modules/streams/ReadableStreamInternals.js:
(privateInitializeReadableStreamReader):
(cancelReadableStream):
(readFromReadableStreamReader):
* Modules/streams/ReadableStreamReader.js:
(cancel):
(read):
(closed):
* Modules/streams/StreamInternals.js:
(promiseInvokeOrNoop):
(promiseInvokeOrFallbackOrNoop):
* Modules/streams/WritableStream.js:
(initializeWritableStream):
(abort):
(close):
(write):
(closed):
(ready):
* Modules/streams/WritableStreamInternals.js:
(syncWritableStreamStateWithQueue):
LayoutTests:
* streams/streams-promises-expected.txt: Added.
* streams/streams-promises.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="#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="#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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstreamsstreamspromisesexpectedtxt">trunk/LayoutTests/streams/streams-promises-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsstreamspromiseshtml">trunk/LayoutTests/streams/streams-promises.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/LayoutTests/ChangeLog 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-04 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Shield streams against user replacing the Promise constructor
+ https://bugs.webkit.org/show_bug.cgi?id=150887
+
+ Reviewed by Youenn Fablet.
+
+ * streams/streams-promises-expected.txt: Added.
+ * streams/streams-promises.html: Added.
+
</ins><span class="cx"> 2015-11-04 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> SVG: hit testing region for <text> elements is incorrect
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromisesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/streams/streams-promises-expected.txt (0 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises-expected.txt (rev 0)
+++ trunk/LayoutTests/streams/streams-promises-expected.txt 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Streams can be built even if Promise constructor is replaced
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstreamsstreamspromiseshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/streams/streams-promises.html (0 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/streams-promises.html (rev 0)
+++ trunk/LayoutTests/streams/streams-promises.html 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<script src='../resources/testharness.js'></script>
+<script src='../resources/testharnessreport.js'></script>
+<script>
+test(function() {
+ Promise = function() { throw new Error("nasty things"); };
+
+ const rs = new ReadableStream(); // Does not throw.
+ const ws = new WritableStream(); // Does not throw.
+}, 'Streams can be built even if Promise constructor is replaced');
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/ChangeLog 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-11-04 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Shield streams against user replacing the Promise constructor
+ https://bugs.webkit.org/show_bug.cgi?id=150887
+
+ Reviewed by Youenn Fablet.
+
+ With this rework, we shield the Streams implementation against the user doing something like "Promise =
+ function() { /* do garbage */ };".
+
+ Test: streams/streams-promises.html.
+
+ * Modules/streams/ReadableStream.js:
+ (initializeReadableStream):
+ (cancel):
+ * Modules/streams/ReadableStreamInternals.js:
+ (privateInitializeReadableStreamReader):
+ (cancelReadableStream):
+ (readFromReadableStreamReader):
+ * Modules/streams/ReadableStreamReader.js:
+ (cancel):
+ (read):
+ (closed):
+ * Modules/streams/StreamInternals.js:
+ (promiseInvokeOrNoop):
+ (promiseInvokeOrFallbackOrNoop):
+ * Modules/streams/WritableStream.js:
+ (initializeWritableStream):
+ (abort):
+ (close):
+ (write):
+ (closed):
+ (ready):
+ * Modules/streams/WritableStreamInternals.js:
+ (syncWritableStreamStateWithQueue):
+
</ins><span class="cx"> 2015-11-04 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> SVG: hit testing region for <text> elements is incorrect
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-11-04 11:15:51 UTC (rev 192021)
</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.resolve(result).then(function() {
</ins><span class="cx"> _this.@started = true;
</span><span class="cx"> @requestReadableStreamPull(_this);
</span><span class="cx"> }, function(error) {
</span><span class="lines">@@ -72,10 +72,10 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isReadableStream(this))
</span><del>- return Promise.reject(new @TypeError("Function should be called on a ReadableStream"));
</del><ins>+ return @Promise.reject(new @TypeError("Function should be called on a ReadableStream"));
</ins><span class="cx">
</span><span class="cx"> if (@isReadableStreamLocked(this))
</span><del>- return Promise.reject(new @TypeError("ReadableStream is locked"));
</del><ins>+ return @Promise.reject(new @TypeError("ReadableStream is locked"));
</ins><span class="cx">
</span><span class="cx"> return @cancelReadableStream(this, reason);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-04 11:15:51 UTC (rev 192021)
</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.@closedPromiseCapability = @newPromiseCapability(Promise);
</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.@closedPromiseCapability = { @promise: Promise.resolve(undefined) };
</del><ins>+ this.@closedPromiseCapability = { @promise: @Promise.resolve(undefined) };
</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.@closedPromiseCapability = { @promise: Promise.reject(stream.@storedError) };
</del><ins>+ this.@closedPromiseCapability = { @promise: @Promise.reject(stream.@storedError) };
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="lines">@@ -275,9 +275,9 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (stream.@state === @streamClosed)
</span><del>- return Promise.resolve();
</del><ins>+ return @Promise.resolve();
</ins><span class="cx"> if (stream.@state === @streamErrored)
</span><del>- return Promise.reject(stream.@storedError);
</del><ins>+ return @Promise.reject(stream.@storedError);
</ins><span class="cx"> stream.@queue = @newQueue();
</span><span class="cx"> @finishClosingReadableStream(stream);
</span><span class="cx"> return @promiseInvokeOrNoop(stream.@underlyingSource, "cancel", [reason]).then(function() { });
</span><span class="lines">@@ -354,9 +354,9 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (reader.@state === @streamClosed)
</span><del>- return Promise.resolve({value: undefined, done: true});
</del><ins>+ return @Promise.resolve({value: undefined, done: true});
</ins><span class="cx"> if (reader.@state === @streamErrored)
</span><del>- return Promise.reject(reader.@storedError);
</del><ins>+ return @Promise.reject(reader.@storedError);
</ins><span class="cx"> // FIXME: ASSERT(!!reader.@ownerReadableStream);
</span><span class="cx"> // FIXME: ASSERT(reader.@ownerReadableStream.@state === @streamReadable);
</span><span class="cx"> var stream = reader.@ownerReadableStream;
</span><span class="lines">@@ -366,9 +366,9 @@
</span><span class="cx"> @requestReadableStreamPull(stream);
</span><span class="cx"> else if (!stream.@queue.content.length)
</span><span class="cx"> @finishClosingReadableStream(stream);
</span><del>- return Promise.resolve({value: chunk, done: false});
</del><ins>+ return @Promise.resolve({value: chunk, done: false});
</ins><span class="cx"> }
</span><del>- var readPromiseCapability = @newPromiseCapability(Promise);
</del><ins>+ var readPromiseCapability = @newPromiseCapability(@Promise);
</ins><span class="cx"> reader.@readRequests.push(readPromiseCapability);
</span><span class="cx"> @requestReadableStreamPull(stream);
</span><span class="cx"> return readPromiseCapability.@promise;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -30,13 +30,13 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isReadableStreamReader(this))
</span><del>- return Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
</del><ins>+ return @Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamClosed)
</span><del>- return Promise.resolve();
</del><ins>+ return @Promise.resolve();
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamErrored)
</span><del>- return Promise.reject(this.@storedError);
</del><ins>+ return @Promise.reject(this.@storedError);
</ins><span class="cx">
</span><span class="cx"> // FIXME: ASSERT(@isReadableStream(this.@ownerReadableStream));
</span><span class="cx"> // FIXME: ASSERT(this.@ownerReadableStream.@state === @streamReadable);
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isReadableStreamReader(this))
</span><del>- return Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
</del><ins>+ return @Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
</ins><span class="cx">
</span><span class="cx"> return @readFromReadableStreamReader(this);
</span><span class="cx"> }
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isReadableStreamReader(this))
</span><del>- return Promise.reject(new @TypeError("Callee of closed is not a ReadableStreamReader"));
</del><ins>+ return @Promise.reject(new @TypeError("Callee of closed is not a ReadableStreamReader"));
</ins><span class="cx">
</span><span class="cx"> return this.@closedPromiseCapability.@promise;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/StreamInternals.js (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> try {
</span><span class="cx"> var method = object[key];
</span><span class="cx"> if (typeof method === "undefined")
</span><del>- return Promise.resolve();
</del><ins>+ return @Promise.resolve();
</ins><span class="cx"> var result = method.@apply(object, args);
</span><del>- return Promise.resolve(result);
</del><ins>+ return @Promise.resolve(result);
</ins><span class="cx"> }
</span><span class="cx"> catch(error) {
</span><del>- return Promise.reject(error);
</del><ins>+ return @Promise.reject(error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> if (typeof method === "undefined")
</span><span class="cx"> return @promiseInvokeOrNoop(object, key2, args2);
</span><span class="cx"> const result = method.@apply(object, args1);
</span><del>- return Promise.resolve(result);
</del><ins>+ return @Promise.resolve(result);
</ins><span class="cx"> }
</span><span class="cx"> catch(error) {
</span><del>- return Promise.reject(error);
</del><ins>+ return @Promise.reject(error);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStream.js (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-04 11:15:51 UTC (rev 192021)
</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.@closedPromiseCapability = @newPromiseCapability(Promise);
- this.@readyPromiseCapability = { @promise: Promise.resolve(undefined) };
</del><ins>+ this.@closedPromiseCapability = @newPromiseCapability(@Promise);
+ this.@readyPromiseCapability = { @promise: @Promise.resolve(undefined) };
</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">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> var error = @errorWritableStream.bind(this);
</span><span class="cx"> var startResult = @invokeOrNoop(underlyingSink, "start", [error]);
</span><del>- this.@startedPromise = Promise.resolve(startResult);
</del><ins>+ this.@startedPromise = @Promise.resolve(startResult);
</ins><span class="cx"> var _this = this;
</span><span class="cx"> this.@startedPromise.then(function() {
</span><span class="cx"> _this.@started = true;
</span><span class="lines">@@ -70,13 +70,13 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isWritableStream(this))
</span><del>- return Promise.reject(new @TypeError("The WritableStream.abort method can only be used on instances of WritableStream"));
</del><ins>+ return @Promise.reject(new @TypeError("The WritableStream.abort method can only be used on instances of WritableStream"));
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamClosed)
</span><del>- return Promise.resolve(undefined);
</del><ins>+ return @Promise.resolve(undefined);
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamErrored)
</span><del>- return Promise.reject(this.@storedError);
</del><ins>+ return @Promise.reject(this.@storedError);
</ins><span class="cx">
</span><span class="cx"> @errorWritableStream.@apply(this, [reason]);
</span><span class="cx">
</span><span class="lines">@@ -90,13 +90,13 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isWritableStream(this))
</span><del>- return Promise.reject(new @TypeError("The WritableStream.close method can only be used on instances of WritableStream"));
</del><ins>+ return @Promise.reject(new @TypeError("The WritableStream.close method can only be used on instances of WritableStream"));
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamClosed || this.@state === @streamClosing)
</span><del>- return Promise.reject(new @TypeError("Cannot close a WritableString that is closed or closing"));
</del><ins>+ return @Promise.reject(new @TypeError("Cannot close a WritableString that is closed or closing"));
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamErrored)
</span><del>- return Promise.reject(this.@storedError);
</del><ins>+ return @Promise.reject(this.@storedError);
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamWaiting)
</span><span class="cx"> this.@readyPromiseCapability.@resolve.@call(undefined, undefined);
</span><span class="lines">@@ -113,13 +113,13 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isWritableStream(this))
</span><del>- return Promise.reject(new @TypeError("The WritableStream.close method can only be used on instances of WritableStream"));
</del><ins>+ return @Promise.reject(new @TypeError("The WritableStream.close method can only be used on instances of WritableStream"));
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamClosed || this.@state === @streamClosing)
</span><del>- return Promise.reject(new @TypeError("Cannot write on a WritableString that is closed or closing"));
</del><ins>+ return @Promise.reject(new @TypeError("Cannot write on a WritableString that is closed or closing"));
</ins><span class="cx">
</span><span class="cx"> if (this.@state === @streamErrored)
</span><del>- return Promise.reject(this.@storedError);
</del><ins>+ return @Promise.reject(this.@storedError);
</ins><span class="cx">
</span><span class="cx"> // FIXME
</span><span class="cx"> // assert(this.@state === @streamWritable || this.@state === @streamWaiting);
</span><span class="lines">@@ -130,16 +130,16 @@
</span><span class="cx"> chunkSize = this.@strategy.size.@call(undefined, chunk);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> @errorWritableStream.@call(this, e);
</span><del>- return Promise.reject(e);
</del><ins>+ return @Promise.reject(e);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const promiseCapability = @newPromiseCapability(Promise);
</del><ins>+ const promiseCapability = @newPromiseCapability(@Promise);
</ins><span class="cx"> try {
</span><span class="cx"> @enqueueValueWithSize(this.@queue, { promiseCapability: promiseCapability, chunk: chunk }, chunkSize);
</span><span class="cx"> } catch (e) {
</span><span class="cx"> @errorWritableStream.@call(this, e);
</span><del>- return Promise.reject(e);
</del><ins>+ return @Promise.reject(e);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @syncWritableStreamStateWithQueue(this);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isWritableStream(this))
</span><del>- return Promise.reject(new @TypeError("The WritableStream.closed getter can only be used on instances of WritableStream"));
</del><ins>+ return @Promise.reject(new @TypeError("The WritableStream.closed getter can only be used on instances of WritableStream"));
</ins><span class="cx">
</span><span class="cx"> return this.@closedPromiseCapability.@promise;
</span><span class="cx"> }
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (!@isWritableStream(this))
</span><del>- return Promise.reject(new @TypeError("The WritableStream.ready getter can only be used on instances of WritableStream"));
</del><ins>+ return @Promise.reject(new @TypeError("The WritableStream.ready getter can only be used on instances of WritableStream"));
</ins><span class="cx">
</span><span class="cx"> return this.@readyPromiseCapability.@promise;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (192020 => 192021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-04 10:40:17 UTC (rev 192020)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-04 11:15:51 UTC (rev 192021)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> const shouldApplyBackpressure = stream.@queue.size > stream.@strategy.highWaterMark;
</span><span class="cx"> if (shouldApplyBackpressure && stream.@state === @streamWritable) {
</span><span class="cx"> stream.@state = @streamWaiting;
</span><del>- stream.@readyPromiseCapability = @newPromiseCapability(Promise);
</del><ins>+ stream.@readyPromiseCapability = @newPromiseCapability(@Promise);
</ins><span class="cx"> }
</span><span class="cx"> if (!shouldApplyBackpressure && stream.@state === @streamWaiting) {
</span><span class="cx"> stream.@state = @streamWritable;
</span></span></pre>
</div>
</div>
</body>
</html>