<!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>[265748] 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/265748">265748</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2020-08-17 00:31:01 -0700 (Mon, 17 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make sure writableStreamDefaultWriterEnsureClosedPromiseRejected overwrite the closedPromise if needed
https://bugs.webkit.org/show_bug.cgi?id=215540

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

* web-platform-tests/streams/writable-streams/aborting.any-expected.txt:
* web-platform-tests/streams/writable-streams/aborting.any.worker-expected.txt:

Source/WebCore:

Covered by rebased tests.

* Modules/streams/WritableStreamInternals.js:
(writableStreamDefaultWriterEnsureClosedPromiseRejected):
As per spec, if promise is already settled, we overwrite it to reject it.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamswritablestreamsabortinganyexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamswritablestreamsabortinganyworkerexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any.worker-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (265747 => 265748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-08-17 07:26:46 UTC (rev 265747)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2020-08-17 07:31:01 UTC (rev 265748)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2020-08-17  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        Make sure writableStreamDefaultWriterEnsureClosedPromiseRejected overwrite the closedPromise if needed
+        https://bugs.webkit.org/show_bug.cgi?id=215540
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/streams/writable-streams/aborting.any-expected.txt:
+        * web-platform-tests/streams/writable-streams/aborting.any.worker-expected.txt:
+
+2020-08-17  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Check WritableStream underlyingSink methods
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=215539
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamswritablestreamsabortinganyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any-expected.txt (265747 => 265748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any-expected.txt     2020-08-17 07:26:46 UTC (rev 265747)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any-expected.txt        2020-08-17 07:31:01 UTC (rev 265748)
</span><span class="lines">@@ -29,17 +29,11 @@
</span><span class="cx"> PASS if a writer is created for a stream with a pending abort, its ready should be rejected with the abort error 
</span><span class="cx"> PASS writer close() promise should resolve before abort() promise 
</span><span class="cx"> PASS writer.ready should reject on controller error without waiting for underlying write 
</span><del>-FAIL writer.abort() while there is an in-flight write, and then finish the write with rejection promise_rejects_js: writer.closed must be rejected with an error indicating release function "function () { throw e }" threw object "error1: error1" ("error1") expected instance of function "function TypeError() {
-    [native code]
-}" ("TypeError")
-FAIL writer.abort(), controller.error() while there is an in-flight write, and then finish the write promise_rejects_js: writer.closed must be rejected with an error indicating release function "function () { throw e }" threw object "error1: error1" ("error1") expected instance of function "function TypeError() {
-    [native code]
-}" ("TypeError")
-FAIL writer.abort(), controller.error() while there is an in-flight close, and then finish the close assert_unreached: Should have rejected: writer.closed must be rejected with an error indicating release Reached unreachable code
-FAIL controller.error(), writer.abort() while there is an in-flight write, and then finish the write promise_rejects_js: writer.closed must be rejected with an error indicating release function "function () { throw e }" threw object "error2: error2" ("error2") expected instance of function "function TypeError() {
-    [native code]
-}" ("TypeError")
-FAIL controller.error(), writer.abort() while there is an in-flight close, and then finish the close assert_unreached: Should have rejected: writer.closed must be rejected with an error indicating release Reached unreachable code
</del><ins>+PASS writer.abort() while there is an in-flight write, and then finish the write with rejection 
+PASS writer.abort(), controller.error() while there is an in-flight write, and then finish the write 
+PASS writer.abort(), controller.error() while there is an in-flight close, and then finish the close 
+PASS controller.error(), writer.abort() while there is an in-flight write, and then finish the write 
+PASS controller.error(), writer.abort() while there is an in-flight close, and then finish the close 
</ins><span class="cx"> PASS releaseLock() while aborting should reject the original closed promise 
</span><span class="cx"> PASS releaseLock() during delayed async abort() should reject the writer.closed promise 
</span><span class="cx"> PASS sink abort() should not be called until sink start() is done 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamswritablestreamsabortinganyworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any.worker-expected.txt (265747 => 265748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any.worker-expected.txt      2020-08-17 07:26:46 UTC (rev 265747)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/writable-streams/aborting.any.worker-expected.txt 2020-08-17 07:31:01 UTC (rev 265748)
</span><span class="lines">@@ -29,17 +29,11 @@
</span><span class="cx"> PASS if a writer is created for a stream with a pending abort, its ready should be rejected with the abort error 
</span><span class="cx"> PASS writer close() promise should resolve before abort() promise 
</span><span class="cx"> PASS writer.ready should reject on controller error without waiting for underlying write 
</span><del>-FAIL writer.abort() while there is an in-flight write, and then finish the write with rejection promise_rejects_js: writer.closed must be rejected with an error indicating release function "function () { throw e }" threw object "error1: error1" ("error1") expected instance of function "function TypeError() {
-    [native code]
-}" ("TypeError")
-FAIL writer.abort(), controller.error() while there is an in-flight write, and then finish the write promise_rejects_js: writer.closed must be rejected with an error indicating release function "function () { throw e }" threw object "error1: error1" ("error1") expected instance of function "function TypeError() {
-    [native code]
-}" ("TypeError")
-FAIL writer.abort(), controller.error() while there is an in-flight close, and then finish the close assert_unreached: Should have rejected: writer.closed must be rejected with an error indicating release Reached unreachable code
-FAIL controller.error(), writer.abort() while there is an in-flight write, and then finish the write promise_rejects_js: writer.closed must be rejected with an error indicating release function "function () { throw e }" threw object "error2: error2" ("error2") expected instance of function "function TypeError() {
-    [native code]
-}" ("TypeError")
-FAIL controller.error(), writer.abort() while there is an in-flight close, and then finish the close assert_unreached: Should have rejected: writer.closed must be rejected with an error indicating release Reached unreachable code
</del><ins>+PASS writer.abort() while there is an in-flight write, and then finish the write with rejection 
+PASS writer.abort(), controller.error() while there is an in-flight write, and then finish the write 
+PASS writer.abort(), controller.error() while there is an in-flight close, and then finish the close 
+PASS controller.error(), writer.abort() while there is an in-flight write, and then finish the write 
+PASS controller.error(), writer.abort() while there is an in-flight close, and then finish the close 
</ins><span class="cx"> PASS releaseLock() while aborting should reject the original closed promise 
</span><span class="cx"> PASS releaseLock() during delayed async abort() should reject the writer.closed promise 
</span><span class="cx"> PASS sink abort() should not be called until sink start() is done 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (265747 => 265748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-08-17 07:26:46 UTC (rev 265747)
+++ trunk/Source/WebCore/ChangeLog      2020-08-17 07:31:01 UTC (rev 265748)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2020-08-17  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        Make sure writableStreamDefaultWriterEnsureClosedPromiseRejected overwrite the closedPromise if needed
+        https://bugs.webkit.org/show_bug.cgi?id=215540
+
+        Reviewed by Darin Adler.
+
+        Covered by rebased tests.
+
+        * Modules/streams/WritableStreamInternals.js:
+        (writableStreamDefaultWriterEnsureClosedPromiseRejected):
+        As per spec, if promise is already settled, we overwrite it to reject it.
+
+2020-08-17  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Check WritableStream underlyingSink methods
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=215539
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsWritableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js (265747 => 265748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js  2020-08-17 07:26:46 UTC (rev 265747)
+++ trunk/Source/WebCore/Modules/streams/WritableStreamInternals.js     2020-08-17 07:31:01 UTC (rev 265748)
</span><span class="lines">@@ -381,9 +381,17 @@
</span><span class="cx"> 
</span><span class="cx"> function writableStreamDefaultWriterEnsureClosedPromiseRejected(writer, error)
</span><span class="cx"> {
</span><del>-     const closedPromise = @getByIdDirectPrivate(writer, "closedPromise");
-     closedPromise.@reject.@call(@undefined, error);
-     @putPromiseInternalField(closedPromise.@promise, @promiseFieldFlags, @getPromiseInternalField(closedPromise.@promise, @promiseFieldFlags) | @promiseFlagsIsHandled);
</del><ins>+    let closedPromiseCapability = @getByIdDirectPrivate(writer, "closedPromise");
+    let closedPromise = closedPromiseCapability.@promise;
+
+    if ((@getPromiseInternalField(closedPromise, @promiseFieldFlags) & @promiseStateMask) !== @promiseStatePending) {
+        closedPromiseCapability = @newPromiseCapability(@Promise);
+        closedPromise = closedPromiseCapability.@promise;
+        @putByIdDirectPrivate(writer, "closedPromise", closedPromiseCapability);
+    }
+
+    closedPromiseCapability.@reject.@call(@undefined, error);
+    @putPromiseInternalField(closedPromise, @promiseFieldFlags, @getPromiseInternalField(closedPromise, @promiseFieldFlags) | @promiseFlagsIsHandled);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function writableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error)
</span></span></pre>
</div>
</div>

</body>
</html>