<!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>[191730] 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/191730">191730</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-10-29 09:51:41 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Turn WS states into integers and fix state initialization
https://bugs.webkit.org/show_bug.cgi?id=150667
Reviewed by Youenn Fablet.
The goal of this patch is turning the writable stream states into integers instead of strings.
First readable stream states were reworked to be shared with writable stream too, they are now just @stream*.
Next step was having writable stream using integers instead of strings and translating those integers back to
strings to be able to return them correctly with the writable stream state attribute.
The state initialization was fixed and now it is not needed to check for the state to be undefined.
Rework, no new tests needed.
* Modules/streams/ReadableStream.js:
(initializeReadableStream):
* Modules/streams/ReadableStreamController.js:
(enqueue):
(error):
(close):
* Modules/streams/ReadableStreamInternals.js:
(privateInitializeReadableStreamReader):
(errorReadableStream):
(cancelReadableStream):
(finishClosingReadableStream):
(closeReadableStream):
(closeReadableStreamReader):
(enqueueInReadableStream):
(readFromReadableStreamReader):
* Modules/streams/ReadableStreamReader.js:
(cancel):
* Modules/streams/WritableStream.js:
(initializeWritableStream):
(abort):
(close):
(write):
(state):
* Modules/streams/WritableStreamInternals.js:
(syncWritableStreamStateWithQueue):
(errorWritableStream):
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::finishCreation):
* bindings/js/WebCoreBuiltinNames.h:</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="#trunkSourceWebCoreModulesstreamsReadableStreamControllerjs">trunk/Source/WebCore/Modules/streams/ReadableStreamController.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="#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="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</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 (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2015-10-29 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Turn WS states into integers and fix state initialization
+ https://bugs.webkit.org/show_bug.cgi?id=150667
+
+ Reviewed by Youenn Fablet.
+
+ The goal of this patch is turning the writable stream states into integers instead of strings.
+
+ First readable stream states were reworked to be shared with writable stream too, they are now just @stream*.
+
+ Next step was having writable stream using integers instead of strings and translating those integers back to
+ strings to be able to return them correctly with the writable stream state attribute.
+
+ The state initialization was fixed and now it is not needed to check for the state to be undefined.
+
+ Rework, no new tests needed.
+
+ * Modules/streams/ReadableStream.js:
+ (initializeReadableStream):
+ * Modules/streams/ReadableStreamController.js:
+ (enqueue):
+ (error):
+ (close):
+ * Modules/streams/ReadableStreamInternals.js:
+ (privateInitializeReadableStreamReader):
+ (errorReadableStream):
+ (cancelReadableStream):
+ (finishClosingReadableStream):
+ (closeReadableStream):
+ (closeReadableStreamReader):
+ (enqueueInReadableStream):
+ (readFromReadableStreamReader):
+ * Modules/streams/ReadableStreamReader.js:
+ (cancel):
+ * Modules/streams/WritableStream.js:
+ (initializeWritableStream):
+ (abort):
+ (close):
+ (write):
+ (state):
+ * Modules/streams/WritableStreamInternals.js:
+ (syncWritableStreamStateWithQueue):
+ (errorWritableStream):
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::finishCreation):
+ * bindings/js/WebCoreBuiltinNames.h:
+
</ins><span class="cx"> 2015-10-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Support IDBDatabase.transaction() (and transaction scheduling in general).
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> this.@underlyingSource = underlyingSource;
</span><span class="cx">
</span><span class="cx"> this.@queue = @newQueue();
</span><del>- this.@state = @readableStreamReadable;
</del><ins>+ this.@state = @streamReadable;
</ins><span class="cx"> this.@started = false;
</span><span class="cx"> this.@closeRequested = false;
</span><span class="cx"> this.@pullAgain = false;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> _this.@started = true;
</span><span class="cx"> @requestReadableStreamPull(_this);
</span><span class="cx"> }, function(error) {
</span><del>- if (_this.@state === @readableStreamReadable)
</del><ins>+ if (_this.@state === @streamReadable)
</ins><span class="cx"> @errorReadableStream(_this, error);
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamController.js (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamController.js 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamController.js 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> throw new @TypeError("Function should be called on a ReadableStreamController");
</span><span class="cx">
</span><span class="cx"> var stream = this.@controlledReadableStream;
</span><del>- if (stream.@state === @readableStreamErrored)
</del><ins>+ if (stream.@state === @streamErrored)
</ins><span class="cx"> throw stream.@storedError;
</span><span class="cx">
</span><span class="cx"> if (stream.@closeRequested)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> throw new @TypeError("Function should be called on a ReadableStreamController");
</span><span class="cx">
</span><span class="cx"> var stream = this.@controlledReadableStream;
</span><del>- if (stream.@state !== @readableStreamReadable)
</del><ins>+ if (stream.@state !== @streamReadable)
</ins><span class="cx"> throw new @TypeError("ReaableStream is not readable");
</span><span class="cx">
</span><span class="cx"> @errorReadableStream(stream, error);
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> if (stream.@closeRequested)
</span><span class="cx"> throw new @TypeError("ReadableStream is already requested to close");
</span><span class="cx">
</span><del>- if (stream.@state === @readableStreamErrored)
</del><ins>+ if (stream.@state === @streamErrored)
</ins><span class="cx"> throw new @TypeError("ReadableStream is already errored");
</span><span class="cx">
</span><span class="cx"> @closeReadableStream(stream);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -38,20 +38,20 @@
</span><span class="cx">
</span><span class="cx"> this.@state = stream.@state;
</span><span class="cx"> this.@readRequests = [];
</span><del>- if (stream.@state === @readableStreamReadable) {
</del><ins>+ if (stream.@state === @streamReadable) {
</ins><span class="cx"> this.@ownerReadableStream = stream;
</span><span class="cx"> this.@storedError = undefined;
</span><span class="cx"> stream.@reader = this;
</span><span class="cx"> this.@closedPromise = @createNewStreamsPromise();
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><del>- if (stream.@state === @readableStreamClosed) {
</del><ins>+ if (stream.@state === @streamClosed) {
</ins><span class="cx"> this.@ownerReadableStream = null;
</span><span class="cx"> this.@storedError = undefined;
</span><span class="cx"> this.@closedPromise = Promise.resolve();
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><del>- // TODO: ASSERT(stream.@state === @readableStreamErrored);
</del><ins>+ // FIXME: ASSERT(stream.@state === @streamErrored);
</ins><span class="cx"> this.@ownerReadableStream = null;
</span><span class="cx"> this.@storedError = stream.@storedError;
</span><span class="cx"> this.@closedPromise = Promise.reject(stream.@storedError);
</span><span class="lines">@@ -196,10 +196,10 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // TODO: ASSERT(stream.@state === @readableStreamReadable);
</del><ins>+ // FIXME: ASSERT(stream.@state === @streamReadable);
</ins><span class="cx"> stream.@queue = @newQueue();
</span><span class="cx"> stream.@storedError = error;
</span><del>- stream.@state = @readableStreamErrored;
</del><ins>+ stream.@state = @streamErrored;
</ins><span class="cx">
</span><span class="cx"> if (!stream.@reader)
</span><span class="cx"> return;
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> @releaseReadableStreamReader(reader);
</span><span class="cx"> reader.@storedError = error;
</span><del>- reader.@state = @readableStreamErrored;
</del><ins>+ reader.@state = @streamErrored;
</ins><span class="cx">
</span><span class="cx"> @rejectStreamsPromise(reader.@closedPromise, error);
</span><span class="cx"> }
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- if (stream.@state !== @readableStreamReadable)
</del><ins>+ if (stream.@state !== @streamReadable)
</ins><span class="cx"> return;
</span><span class="cx"> if (stream.@closeRequested)
</span><span class="cx"> return;
</span><span class="lines">@@ -275,9 +275,9 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- if (stream.@state === @readableStreamClosed)
</del><ins>+ if (stream.@state === @streamClosed)
</ins><span class="cx"> return Promise.resolve();
</span><del>- if (stream.@state === @readableStreamErrored)
</del><ins>+ if (stream.@state === @streamErrored)
</ins><span class="cx"> return Promise.reject(stream.@storedError);
</span><span class="cx"> stream.@queue = @newQueue();
</span><span class="cx"> @finishClosingReadableStream(stream);
</span><span class="lines">@@ -288,8 +288,8 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // TODO: ASSERT(stream.@state === @readableStreamReadable);
- stream.@state = @readableStreamClosed;
</del><ins>+ // FIXME: ASSERT(stream.@state === @streamReadable);
+ stream.@state = @streamClosed;
</ins><span class="cx"> var reader = stream.@reader;
</span><span class="cx"> if (reader)
</span><span class="cx"> @closeReadableStreamReader(reader);
</span><span class="lines">@@ -299,9 +299,9 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // TODO. ASSERT(!stream.@closeRequested);
- // TODO: ASSERT(stream.@state !== @readableStreamErrored);
- if (stream.@state === @readableStreamClosed)
</del><ins>+ // FIXME: ASSERT(!stream.@closeRequested);
+ // FIXME: ASSERT(stream.@state !== @streamErrored);
+ if (stream.@state === @streamClosed)
</ins><span class="cx"> return;
</span><span class="cx"> stream.@closeRequested = true;
</span><span class="cx"> if (!stream.@queue.content.length)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> @resolveStreamsPromise(requests[index], {value:undefined, done: true});
</span><span class="cx"> reader.@readRequests = [];
</span><span class="cx"> @releaseReadableStreamReader(reader);
</span><del>- reader.@state = @readableStreamClosed;
</del><ins>+ reader.@state = @streamClosed;
</ins><span class="cx"> @resolveStreamsPromise(reader.@closedPromise);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -325,9 +325,9 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // TODO: ASSERT(!stream.@closeRequested);
- // TODO: ASSERT(stream.@state !== @readableStreamErrored);
- if (stream.@state === @readableStreamClosed)
</del><ins>+ // FIXME: ASSERT(!stream.@closeRequested);
+ // FIXME: ASSERT(stream.@state !== @streamErrored);
+ if (stream.@state === @streamClosed)
</ins><span class="cx"> return undefined;
</span><span class="cx"> if (@isReadableStreamLocked(stream) && stream.@reader.@readRequests.length) {
</span><span class="cx"> @resolveStreamsPromise(stream.@reader.@readRequests.shift(), {value: chunk, done: false});
</span><span class="lines">@@ -354,12 +354,12 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- if (reader.@state === @readableStreamClosed)
</del><ins>+ if (reader.@state === @streamClosed)
</ins><span class="cx"> return Promise.resolve({value: undefined, done: true});
</span><del>- if (reader.@state === @readableStreamErrored)
</del><ins>+ if (reader.@state === @streamErrored)
</ins><span class="cx"> return Promise.reject(reader.@storedError);
</span><del>- // TODO: ASSERT(!!reader.@ownerReadableStream);
- // TODO: ASSERT(reader.@ownerReadableStream.@state === @readableStreamReadable);
</del><ins>+ // FIXME: ASSERT(!!reader.@ownerReadableStream);
+ // FIXME: ASSERT(reader.@ownerReadableStream.@state === @streamReadable);
</ins><span class="cx"> var stream = reader.@ownerReadableStream;
</span><span class="cx"> if (stream.@queue.content.length) {
</span><span class="cx"> var chunk = @dequeueValue(stream.@queue);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx"> if (!@isReadableStreamReader(this))
</span><span class="cx"> return Promise.reject(new @TypeError("Function should be called on a ReadableStreamReader"));
</span><span class="cx">
</span><del>- if (this.@state === @readableStreamClosed)
</del><ins>+ if (this.@state === @streamClosed)
</ins><span class="cx"> return Promise.resolve();
</span><span class="cx">
</span><del>- if (this.@state === @readableStreamErrored)
</del><ins>+ if (this.@state === @streamErrored)
</ins><span class="cx"> return Promise.reject(this.@storedError);
</span><span class="cx">
</span><del>- // TODO ASSERT(@isReadableStream(this.@ownerReadableStream));
- // TODO ASSERT(this.@ownerReadableStream.@state === @readableStreamReadable);
</del><ins>+ // FIXME: ASSERT(@isReadableStream(this.@ownerReadableStream));
+ // FIXME: ASSERT(this.@ownerReadableStream.@state === @streamReadable);
</ins><span class="cx"> return @cancelReadableStream(this.@ownerReadableStream, reason);
</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 (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> this.@closedPromise = @createNewStreamsPromise();
</span><span class="cx"> this.@readyPromise = Promise.resolve(undefined);
</span><span class="cx"> this.@queue = @newQueue();
</span><ins>+ this.@state = @streamWritable;
</ins><span class="cx"> this.@started = false;
</span><span class="cx"> this.@writing = false;
</span><span class="cx">
</span><span class="lines">@@ -71,10 +72,10 @@
</span><span class="cx"> if (!@isWritableStream(this))
</span><span class="cx"> return Promise.reject(new @TypeError("The WritableStream.abort method can only be used on instances of WritableStream"));
</span><span class="cx">
</span><del>- if (this.@state === "closed")
</del><ins>+ if (this.@state === @streamClosed)
</ins><span class="cx"> return Promise.resolve(undefined);
</span><span class="cx">
</span><del>- if (this.@state === "errored")
</del><ins>+ if (this.@state === @streamErrored)
</ins><span class="cx"> return Promise.reject(this.@storedError);
</span><span class="cx">
</span><span class="cx"> @errorWritableStream.@apply(this, [reason]);
</span><span class="lines">@@ -91,16 +92,16 @@
</span><span class="cx"> if (!@isWritableStream(this))
</span><span class="cx"> return Promise.reject(new @TypeError("The WritableStream.close method can only be used on instances of WritableStream"));
</span><span class="cx">
</span><del>- if (this.@state === "closed" || this.@state === "closing")
</del><ins>+ if (this.@state === @streamClosed || this.@state === @streamClosing)
</ins><span class="cx"> return Promise.reject(new @TypeError("Cannot close a WritableString that is closed or closing"));
</span><span class="cx">
</span><del>- if (this.@state === "errored")
</del><ins>+ if (this.@state === @streamErrored)
</ins><span class="cx"> return Promise.reject(this.@storedError);
</span><span class="cx">
</span><del>- if (this.@state === "waiting")
</del><ins>+ if (this.@state === @streamWaiting)
</ins><span class="cx"> @resolveStreamsPromise(this.@readyPromise, undefined);
</span><span class="cx">
</span><del>- this.@state = "closing";
</del><ins>+ this.@state = @streamClosing;
</ins><span class="cx"> @enqueueValueWithSize(this.@queue, "close", 0);
</span><span class="cx"> @callOrScheduleWritableStreamAdvanceQueue(this);
</span><span class="cx">
</span><span class="lines">@@ -114,14 +115,14 @@
</span><span class="cx"> if (!@isWritableStream(this))
</span><span class="cx"> return Promise.reject(new @TypeError("The WritableStream.close method can only be used on instances of WritableStream"));
</span><span class="cx">
</span><del>- if (this.@state === "closed" || this.@state === "closing")
</del><ins>+ if (this.@state === @streamClosed || this.@state === @streamClosing)
</ins><span class="cx"> return Promise.reject(new @TypeError("Cannot write on a WritableString that is closed or closing"));
</span><span class="cx">
</span><del>- if (this.@state === "errored")
</del><ins>+ if (this.@state === @streamErrored)
</ins><span class="cx"> return Promise.reject(this.@storedError);
</span><span class="cx">
</span><span class="cx"> // FIXME
</span><del>- // assert(this.@state === "writable" || this.@state === "waiting" || this.@state === undefined);
</del><ins>+ // assert(this.@state === @streamWritable || this.@state === @streamWaiting);
</ins><span class="cx">
</span><span class="cx"> let chunkSize = 1;
</span><span class="cx"> if (this.@strategy.size !== undefined) {
</span><span class="lines">@@ -174,5 +175,21 @@
</span><span class="cx"> if (!@isWritableStream(this))
</span><span class="cx"> throw new @TypeError("The WritableStream.state getter can only be used on instances of WritableStream");
</span><span class="cx">
</span><del>- return this.@state;
</del><ins>+ switch(this.@state) {
+ case @streamClosed:
+ return "closed";
+ case @streamClosing:
+ return "closing";
+ case @streamErrored:
+ return "errored";
+ case @streamWaiting:
+ return "waiting";
+ case @streamWritable:
+ return "writable";
+ }
+
+ // FIXME
+ // assert_not_reached();
+
+ return undefined;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -38,17 +38,17 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- if (stream.@state === "closing")
</del><ins>+ if (stream.@state === @streamClosing)
</ins><span class="cx"> return undefined;
</span><span class="cx">
</span><del>- // TODO
- // assert(stream.@state === "writable" || stream.@state === "waiting" || stream.@state === undefined);
</del><ins>+ // FIXME
+ // assert(stream.@state === @streamWritable || stream.@state === @streamWaiting);
</ins><span class="cx">
</span><span class="cx"> if (stream.@queue.size > stream.@strategy.highWaterMark) {
</span><del>- stream.@state = "waiting";
</del><ins>+ stream.@state = @streamWaiting;
</ins><span class="cx"> stream.@readyPromise = @createNewStreamsPromise();
</span><span class="cx"> } else {
</span><del>- stream.@state = "writable";
</del><ins>+ stream.@state = @streamWritable;
</ins><span class="cx"> @resolveStreamsPromise(stream.@readyPromise, undefined);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- if (this.@state === "closed" || this.@state === "errored")
</del><ins>+ if (this.@state === @streamClosed || this.@state === @streamErrored)
</ins><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><span class="lines">@@ -67,10 +67,10 @@
</span><span class="cx"> @rejectStreamsPromise(writeRecord.promise, e);
</span><span class="cx"> }
</span><span class="cx"> this.@storedError = e;
</span><del>- if (this.@state === "waiting")
</del><ins>+ if (this.@state === @streamWaiting)
</ins><span class="cx"> @resolveStreamsPromise(this.@readyPromise, undefined);
</span><span class="cx"> @rejectStreamsPromise(this.@closedPromise, e);
</span><del>- this.@state = "errored";
</del><ins>+ this.@state = @streamErrored;
</ins><span class="cx"> return undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> const writeRecord = @peekQueueValue(stream.@queue);
</span><span class="cx"> if (writeRecord === "close") {
</span><span class="cx"> // FIXME
</span><del>- // assert(stream.@state === "closing");
</del><ins>+ // assert(stream.@state === @streamClosing);
</ins><span class="cx"> @dequeueValue(stream.@queue);
</span><span class="cx"> // FIXME
</span><span class="cx"> // assert(stream.@queue.content.length === 0);
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> stream.@writing = true;
</span><span class="cx"> @promiseInvokeOrNoop(stream.@underlyingSink, "write", [writeRecord.chunk]).then(
</span><span class="cx"> function() {
</span><del>- if (stream.@state === "errored")
</del><ins>+ if (stream.@state === @streamErrored)
</ins><span class="cx"> return;
</span><span class="cx"> stream.@writing = false;
</span><span class="cx"> @resolveStreamsPromise(writeRecord.promise, undefined);
</span><span class="lines">@@ -122,15 +122,15 @@
</span><span class="cx"> function closeWritableStream(stream)
</span><span class="cx"> {
</span><span class="cx"> // FIXME
</span><del>- // assert(stream.@state === "closing");
</del><ins>+ // assert(stream.@state === @streamClosing);
</ins><span class="cx"> @promiseInvokeOrNoop(stream.@underlyingSink, "close").then(
</span><span class="cx"> function() {
</span><del>- if (stream.@state === "errored")
</del><ins>+ if (stream.@state === @streamErrored)
</ins><span class="cx"> return;
</span><span class="cx"> // FIXME
</span><del>- // assert(stream.@state === "closing");
</del><ins>+ // assert(stream.@state === @streamClosing);
</ins><span class="cx"> @resolveStreamsPromise(stream.@closedPromise, undefined);
</span><del>- stream.@state = "closed";
</del><ins>+ stream.@state = @streamClosed;
</ins><span class="cx"> },
</span><span class="cx"> function(r) {
</span><span class="cx"> @errorWritableStream.@apply(stream, [r]);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -87,9 +87,12 @@
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->document, jsNull(), DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->window, m_shell, DontDelete | ReadOnly),
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><del>- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().readableStreamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().readableStreamErroredPrivateName(), jsNumber(2), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().readableStreamReadablePrivateName(), jsNumber(3), DontDelete | ReadOnly),
</del><ins>+ GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamClosingPrivateName(), jsNumber(2), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamErroredPrivateName(), jsNumber(3), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamReadablePrivateName(), jsNumber(4), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamWaitingPrivateName(), jsNumber(5), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamWritablePrivateName(), jsNumber(6), DontDelete | ReadOnly),
</ins><span class="cx"> GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
</span><span class="cx"> #define DECLARE_GLOBAL_STATIC(name)\
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (191729 => 191730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2015-10-29 13:12:33 UTC (rev 191729)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2015-10-29 16:51:41 UTC (rev 191730)
</span><span class="lines">@@ -41,9 +41,6 @@
</span><span class="cx"> macro(pulling) \
</span><span class="cx"> macro(pullAgain) \
</span><span class="cx"> macro(queue) \
</span><del>- macro(readableStreamClosed) \
- macro(readableStreamErrored) \
- macro(readableStreamReadable) \
</del><span class="cx"> macro(reader) \
</span><span class="cx"> macro(readRequests) \
</span><span class="cx"> macro(readyPromise) \
</span><span class="lines">@@ -52,6 +49,12 @@
</span><span class="cx"> macro(startedPromise) \
</span><span class="cx"> macro(storedError) \
</span><span class="cx"> macro(strategy) \
</span><ins>+ macro(streamClosed) \
+ macro(streamClosing) \
+ macro(streamErrored) \
+ macro(streamReadable) \
+ macro(streamWaiting) \
+ macro(streamWritable) \
</ins><span class="cx"> macro(underlyingSink) \
</span><span class="cx"> macro(underlyingSource) \
</span><span class="cx"> macro(writing) \
</span></span></pre>
</div>
</div>
</body>
</html>