<!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>[192160] 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/192160">192160</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-09 10:06:51 -0800 (Mon, 09 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Activate assertions
https://bugs.webkit.org/show_bug.cgi?id=151021
Reviewed by Darin Adler.
Activating assertions in streams API.
Fixing a bug in ReadableStream implementation: when pull promise is rejected,
the readable stream may already be errored by some other means.
Covered by existing test sets in Debug builds.
* Modules/streams/ReadableStreamInternals.js:
(teeReadableStream):
(teeReadableStreamPullFunction):
(errorReadableStream):
(requestReadableStreamPull):
(finishClosingReadableStream):
(closeReadableStream):
(enqueueInReadableStream):
(readFromReadableStreamReader):
* Modules/streams/ReadableStreamReader.js:
(cancel):
* Modules/streams/StreamInternals.js:
(peekQueueValue):
* Modules/streams/WritableStream.js:
(write):
(state):
* Modules/streams/WritableStreamInternals.js:
(syncWritableStreamStateWithQueue):
(closeWritableStream): Deleted.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192159 => 192160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-09 16:34:05 UTC (rev 192159)
+++ trunk/Source/WebCore/ChangeLog 2015-11-09 18:06:51 UTC (rev 192160)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-11-09 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Activate assertions
+ https://bugs.webkit.org/show_bug.cgi?id=151021
+
+ Reviewed by Darin Adler.
+
+ Activating assertions in streams API.
+ Fixing a bug in ReadableStream implementation: when pull promise is rejected,
+ the readable stream may already be errored by some other means.
+
+ Covered by existing test sets in Debug builds.
+
+ * Modules/streams/ReadableStreamInternals.js:
+ (teeReadableStream):
+ (teeReadableStreamPullFunction):
+ (errorReadableStream):
+ (requestReadableStreamPull):
+ (finishClosingReadableStream):
+ (closeReadableStream):
+ (enqueueInReadableStream):
+ (readFromReadableStreamReader):
+ * Modules/streams/ReadableStreamReader.js:
+ (cancel):
+ * Modules/streams/StreamInternals.js:
+ (peekQueueValue):
+ * Modules/streams/WritableStream.js:
+ (write):
+ (state):
+ * Modules/streams/WritableStreamInternals.js:
+ (syncWritableStreamStateWithQueue):
+ (closeWritableStream): Deleted.
+
</ins><span class="cx"> 2015-11-09 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Shield implementation from mangling then and catch promise methods
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192159 => 192160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-09 16:34:05 UTC (rev 192159)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-09 18:06:51 UTC (rev 192160)
</span><span class="lines">@@ -76,8 +76,8 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // TODO: Assert: IsReadableStream(stream) is true.
- // TODO: Assert: Type(shouldClone) is Boolean.
</del><ins>+ @assert(@isReadableStream(stream));
+ @assert(typeof(shouldClone) === "boolean");
</ins><span class="cx">
</span><span class="cx"> let reader = stream.getReader();
</span><span class="cx">
</span><span class="lines">@@ -133,11 +133,11 @@
</span><span class="cx"> if (teeState.closedOrErrored)
</span><span class="cx"> return;
</span><span class="cx"> if (!teeState.canceled1) {
</span><del>- // TODO: Implement cloning if shouldClone is true
</del><ins>+ // FIXME: Implement cloning if shouldClone is true
</ins><span class="cx"> @enqueueInReadableStream(teeState.branch1, result.value);
</span><span class="cx"> }
</span><span class="cx"> if (!teeState.canceled2) {
</span><del>- // TODO: Implement cloning if shouldClone is true
</del><ins>+ // FIXME: Implement cloning if shouldClone is true
</ins><span class="cx"> @enqueueInReadableStream(teeState.branch2, result.value);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // FIXME: ASSERT(stream.@state === @streamReadable);
</del><ins>+ @assert(stream.@state === @streamReadable);
</ins><span class="cx"> stream.@queue = @newQueue();
</span><span class="cx"> stream.@storedError = error;
</span><span class="cx"> stream.@state = @streamErrored;
</span><span class="lines">@@ -244,7 +244,8 @@
</span><span class="cx"> @requestReadableStreamPull(stream);
</span><span class="cx"> }
</span><span class="cx"> }, function(error) {
</span><del>- @errorReadableStream(stream, error);
</del><ins>+ if (stream.@state === @streamReadable)
+ @errorReadableStream(stream, error);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,7 +288,7 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // FIXME: ASSERT(stream.@state === @streamReadable);
</del><ins>+ @assert(stream.@state === @streamReadable);
</ins><span class="cx"> stream.@state = @streamClosed;
</span><span class="cx"> var reader = stream.@reader;
</span><span class="cx"> if (reader)
</span><span class="lines">@@ -298,8 +299,8 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // FIXME: ASSERT(!stream.@closeRequested);
- // FIXME: ASSERT(stream.@state !== @streamErrored);
</del><ins>+ @assert(!stream.@closeRequested);
+ @assert(stream.@state !== @streamErrored);
</ins><span class="cx"> if (stream.@state === @streamClosed)
</span><span class="cx"> return;
</span><span class="cx"> stream.@closeRequested = true;
</span><span class="lines">@@ -324,8 +325,8 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- // FIXME: ASSERT(!stream.@closeRequested);
- // FIXME: ASSERT(stream.@state !== @streamErrored);
</del><ins>+ @assert(!stream.@closeRequested);
+ @assert(stream.@state !== @streamErrored);
</ins><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><span class="lines">@@ -357,8 +358,8 @@
</span><span class="cx"> return @Promise.@resolve({value: undefined, done: true});
</span><span class="cx"> if (reader.@state === @streamErrored)
</span><span class="cx"> return @Promise.@reject(reader.@storedError);
</span><del>- // FIXME: ASSERT(!!reader.@ownerReadableStream);
- // FIXME: ASSERT(reader.@ownerReadableStream.@state === @streamReadable);
</del><ins>+ @assert(!!reader.@ownerReadableStream);
+ @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 (192159 => 192160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-11-09 16:34:05 UTC (rev 192159)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2015-11-09 18:06:51 UTC (rev 192160)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> if (this.@state === @streamErrored)
</span><span class="cx"> return @Promise.@reject(this.@storedError);
</span><span class="cx">
</span><del>- // FIXME: ASSERT(@isReadableStream(this.@ownerReadableStream));
- // FIXME: ASSERT(this.@ownerReadableStream.@state === @streamReadable);
</del><ins>+ @assert(@isReadableStream(this.@ownerReadableStream));
+ @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="trunkSourceWebCoreModulesstreamsStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/StreamInternals.js (192159 => 192160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-11-09 16:34:05 UTC (rev 192159)
+++ trunk/Source/WebCore/Modules/streams/StreamInternals.js 2015-11-09 18:06:51 UTC (rev 192160)
</span><span class="lines">@@ -117,8 +117,7 @@
</span><span class="cx">
</span><span class="cx"> function peekQueueValue(queue)
</span><span class="cx"> {
</span><del>- // FIXME
- // assert(queue.content.length > 0);
</del><ins>+ @assert(queue.content.length > 0);
</ins><span class="cx">
</span><span class="cx"> return queue.content[0].value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStream.js (192159 => 192160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-09 16:34:05 UTC (rev 192159)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-09 18:06:51 UTC (rev 192160)
</span><span class="lines">@@ -121,8 +121,7 @@
</span><span class="cx"> if (this.@state === @streamErrored)
</span><span class="cx"> return @Promise.@reject(this.@storedError);
</span><span class="cx">
</span><del>- // FIXME
- // assert(this.@state === @streamWritable || this.@state === @streamWaiting);
</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">@@ -188,8 +187,5 @@
</span><span class="cx"> return "writable";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME
- // assert_not_reached();
-
- return undefined;
</del><ins>+ @assert(false);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (192159 => 192160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-09 16:34:05 UTC (rev 192159)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-09 18:06:51 UTC (rev 192160)
</span><span class="lines">@@ -41,8 +41,7 @@
</span><span class="cx"> if (stream.@state === @streamClosing)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME
- // assert(stream.@state === @streamWritable || stream.@state === @streamWaiting);
</del><ins>+ @assert(stream.@state === @streamWritable || stream.@state === @streamWaiting);
</ins><span class="cx">
</span><span class="cx"> const shouldApplyBackpressure = stream.@queue.size > stream.@strategy.highWaterMark;
</span><span class="cx"> if (shouldApplyBackpressure && stream.@state === @streamWritable) {
</span><span class="lines">@@ -91,11 +90,9 @@
</span><span class="cx">
</span><span class="cx"> const writeRecord = @peekQueueValue(stream.@queue);
</span><span class="cx"> if (writeRecord === "close") {
</span><del>- // FIXME
- // assert(stream.@state === @streamClosing);
</del><ins>+ @assert(stream.@state === @streamClosing);
</ins><span class="cx"> @dequeueValue(stream.@queue);
</span><del>- // FIXME
- // assert(stream.@queue.content.length === 0);
</del><ins>+ @assert(stream.@queue.content.length === 0);
</ins><span class="cx"> @closeWritableStream(stream);
</span><span class="cx"> return undefined;
</span><span class="cx"> }
</span><span class="lines">@@ -121,14 +118,12 @@
</span><span class="cx">
</span><span class="cx"> function closeWritableStream(stream)
</span><span class="cx"> {
</span><del>- // FIXME
- // assert(stream.@state === @streamClosing);
</del><ins>+ @assert(stream.@state === @streamClosing);
</ins><span class="cx"> @promiseInvokeOrNoop(stream.@underlyingSink, "close").@then(
</span><span class="cx"> function() {
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="cx"> return;
</span><del>- // FIXME
- // assert(stream.@state === @streamClosing);
</del><ins>+ @assert(stream.@state === @streamClosing);
</ins><span class="cx"> stream.@closedPromiseCapability.@resolve.@call(undefined, undefined);
</span><span class="cx"> stream.@state = @streamClosed;
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>