<!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>[191956] 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/191956">191956</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-03 10:29:59 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Vended promise capabilities should not need @resolve/@reject fields
https://bugs.webkit.org/show_bug.cgi?id=150835
Reviewed by Darin Adler.
No change in behavior, covered by existing tests.
* Modules/streams/ReadableStreamInternals.js:
(privateInitializeReadableStreamReader): Removed @resolve/@reject fields from resolved/rejected @closedPromiseCapability.
* Modules/streams/WritableStream.js:
(initializeWritableStream): Removed @resolve/@reject fields from resolved readyPromiseCapability.
* Modules/streams/WritableStreamInternals.js:
(syncWritableStreamStateWithQueue): Updated code to be closer to spec and removing the need to resolve an already resolved promise.</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="#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 (191955 => 191956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-03 18:24:34 UTC (rev 191955)
+++ trunk/Source/WebCore/ChangeLog 2015-11-03 18:29:59 UTC (rev 191956)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Vended promise capabilities should not need @resolve/@reject fields
+ https://bugs.webkit.org/show_bug.cgi?id=150835
+
+ Reviewed by Darin Adler.
+
+ No change in behavior, covered by existing tests.
+
+ * Modules/streams/ReadableStreamInternals.js:
+ (privateInitializeReadableStreamReader): Removed @resolve/@reject fields from resolved/rejected @closedPromiseCapability.
+ * Modules/streams/WritableStream.js:
+ (initializeWritableStream): Removed @resolve/@reject fields from resolved readyPromiseCapability.
+ * Modules/streams/WritableStreamInternals.js:
+ (syncWritableStreamStateWithQueue): Updated code to be closer to spec and removing the need to resolve an already resolved promise.
+
</ins><span class="cx"> 2015-11-03 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Replace 0 and NULL with nullptr in WebCore/dom.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (191955 => 191956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-03 18:24:34 UTC (rev 191955)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-03 18:29:59 UTC (rev 191956)
</span><span class="lines">@@ -48,13 +48,13 @@
</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), @resolve: function() {}, @reject: function() {} };
</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), @resolve: function() {}, @reject: function() {} };
</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></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStream.js (191955 => 191956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-03 18:24:34 UTC (rev 191955)
+++ trunk/Source/WebCore/Modules/streams/WritableStream.js 2015-11-03 18:29:59 UTC (rev 191956)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> this.@underlyingSink = underlyingSink;
</span><span class="cx"> this.@closedPromiseCapability = @newPromiseCapability(Promise);
</span><del>- this.@readyPromiseCapability = { @promise: Promise.resolve(undefined), @resolve: function() {}, @reject: function() {} };
</del><ins>+ 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></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (191955 => 191956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-03 18:24:34 UTC (rev 191955)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js 2015-11-03 18:29:59 UTC (rev 191956)
</span><span class="lines">@@ -39,20 +39,20 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> if (stream.@state === @streamClosing)
</span><del>- return undefined;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> // FIXME
</span><span class="cx"> // assert(stream.@state === @streamWritable || stream.@state === @streamWaiting);
</span><span class="cx">
</span><del>- if (stream.@queue.size > stream.@strategy.highWaterMark) {
</del><ins>+ const shouldApplyBackpressure = stream.@queue.size > stream.@strategy.highWaterMark;
+ if (shouldApplyBackpressure && stream.@state === @streamWritable) {
</ins><span class="cx"> stream.@state = @streamWaiting;
</span><span class="cx"> stream.@readyPromiseCapability = @newPromiseCapability(Promise);
</span><del>- } else {
</del><ins>+ }
+ if (!shouldApplyBackpressure && stream.@state === @streamWaiting) {
</ins><span class="cx"> stream.@state = @streamWritable;
</span><span class="cx"> stream.@readyPromiseCapability.@resolve.@call(undefined, undefined);
</span><span class="cx"> }
</span><del>-
- return undefined;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function errorWritableStream(e)
</span></span></pre>
</div>
</div>
</body>
</html>