<!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>[214265] 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/214265">214265</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-22 11:07:49 -0700 (Wed, 22 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Readable Streams API] Implement ReadableStreamBYOBRequest respond() (readable stream state)
https://bugs.webkit.org/show_bug.cgi?id=169759
Patch by Romain Bellessort <romain.bellessort@crf.canon.fr> on 2017-03-22
Reviewed by Youenn Fablet.
LayoutTests/imported/w3c:
Updated test expectations.
* web-platform-tests/streams/readable-byte-streams/general-expected.txt:
* web-platform-tests/streams/readable-byte-streams/general.dedicatedworker-expected.txt:
Source/WebCore:
Implemented readable state part of respond() function. Parts of code cannot
currently be reached as they require ReadableStreamBYOBReader to be implemented.
Added new tests and updated expectations.
* Modules/streams/ReadableByteStreamInternals.js:
(readableByteStreamControllerEnqueue): Name shortened.
(readableByteStreamControllerRespondInternal): Updated with readable state case.
(cloneArrayBuffer): Added.
(readableByteStreamControllerRespondInReadableState): Added.
(readableByteStreamControllerRespondInClosedState): Updated.
(readableByteStreamControllerProcessPullDescriptors): Added.
(readableByteStreamControllerFillDescriptorFromQueue): Added.
(readableByteStreamControllerShiftPendingDescriptor): Name shortened.
(readableByteStreamControllerCommitDescriptor): Name shortened.
(readableByteStreamControllerConvertDescriptor): Name shortened.
LayoutTests:
Added new tests to check code that can currently be reached.
* streams/readable-stream-byob-request-expected.txt: Updated.
* streams/readable-stream-byob-request.js: Updated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablebytestreamsgeneralexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablebytestreamsgeneraldedicatedworkerexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general.dedicatedworker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreambyobrequestexpectedtxt">trunk/LayoutTests/streams/readable-stream-byob-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreadablestreambyobrequestjs">trunk/LayoutTests/streams/readable-stream-byob-request.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableByteStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/LayoutTests/ChangeLog 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-22 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableStreamBYOBRequest respond() (readable stream state)
+ https://bugs.webkit.org/show_bug.cgi?id=169759
+
+ Reviewed by Youenn Fablet.
+
+ Added new tests to check code that can currently be reached.
+
+ * streams/readable-stream-byob-request-expected.txt: Updated.
+ * streams/readable-stream-byob-request.js: Updated.
+
</ins><span class="cx"> 2017-03-22 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Move LayoutTests/webrtc/rtcconfiguration-icecandidatepoolsize.html to web-platform-tests
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-22 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableStreamBYOBRequest respond() (readable stream state)
+ https://bugs.webkit.org/show_bug.cgi?id=169759
+
+ Reviewed by Youenn Fablet.
+
+ Updated test expectations.
+
+ * web-platform-tests/streams/readable-byte-streams/general-expected.txt:
+ * web-platform-tests/streams/readable-byte-streams/general.dedicatedworker-expected.txt:
+
</ins><span class="cx"> 2017-03-22 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Move LayoutTests/webrtc/rtcconfiguration-icecandidatepoolsize.html to web-platform-tests
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablebytestreamsgeneralexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general-expected.txt (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general-expected.txt 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general-expected.txt 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> PASS ReadableStream with byte source: releaseLock() on ReadableStreamReader with pending read() must throw
</span><span class="cx"> PASS ReadableStream with byte source: Automatic pull() after start()
</span><span class="cx"> PASS ReadableStream with byte source: Automatic pull() after start() and read()
</span><del>-FAIL ReadableStream with byte source: autoAllocateChunkSize assert_equals: pull() must have been invoked once expected 1 but got 0
-FAIL ReadableStream with byte source: Mix of auto allocate and BYOB promise_test: Unhandled rejection with value: object "TypeError: Readable state is not yet supported"
</del><ins>+PASS ReadableStream with byte source: autoAllocateChunkSize
+FAIL ReadableStream with byte source: Mix of auto allocate and BYOB promise_test: Unhandled rejection with value: object "TypeError: ReadableStreamBYOBReader is not implemented"
</ins><span class="cx"> PASS ReadableStream with byte source: Automatic pull() after start() and read(view)
</span><span class="cx"> PASS ReadableStream with byte source: enqueue(), getReader(), then read()
</span><span class="cx"> PASS ReadableStream with byte source: Push source that doesn't understand pull signal
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsreadablebytestreamsgeneraldedicatedworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general.dedicatedworker-expected.txt (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general.dedicatedworker-expected.txt 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams/readable-byte-streams/general.dedicatedworker-expected.txt 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> PASS ReadableStream with byte source: releaseLock() on ReadableStreamReader with pending read() must throw
</span><span class="cx"> PASS ReadableStream with byte source: Automatic pull() after start()
</span><span class="cx"> PASS ReadableStream with byte source: Automatic pull() after start() and read()
</span><del>-FAIL ReadableStream with byte source: autoAllocateChunkSize assert_equals: pull() must have been invoked once expected 1 but got 0
-FAIL ReadableStream with byte source: Mix of auto allocate and BYOB promise_test: Unhandled rejection with value: object "TypeError: Readable state is not yet supported"
</del><ins>+PASS ReadableStream with byte source: autoAllocateChunkSize
+FAIL ReadableStream with byte source: Mix of auto allocate and BYOB promise_test: Unhandled rejection with value: object "TypeError: ReadableStreamBYOBReader is not implemented"
</ins><span class="cx"> PASS ReadableStream with byte source: Automatic pull() after start() and read(view)
</span><span class="cx"> PASS ReadableStream with byte source: enqueue(), getReader(), then read()
</span><span class="cx"> PASS ReadableStream with byte source: Push source that doesn't understand pull signal
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreambyobrequestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-stream-byob-request-expected.txt (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-byob-request-expected.txt 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/LayoutTests/streams/readable-stream-byob-request-expected.txt 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -8,6 +8,8 @@
</span><span class="cx"> PASS Calling respond() with a positive infinity bytesWritten value should throw a RangeError
</span><span class="cx"> PASS Calling respond() with a bytesWritten value different from 0 when stream is closed should throw a TypeError
</span><span class="cx"> PASS Calling respond() with a bytesWritten value of 0 when stream is closed should succeed
</span><ins>+PASS Calling respond() with a bytesWritten value greater than autoAllocateChunkSize should fail
+PASS Calling respond() with a bytesWritten value lower than autoAllocateChunkSize should succeed
</ins><span class="cx"> PASS ReadableStreamBYOBRequest instances should have the correct list of properties
</span><span class="cx"> PASS By default, byobRequest should be undefined
</span><span class="cx"> PASS byobRequest.view length should be equal to autoAllocateChunkSize
</span><span class="lines">@@ -17,4 +19,6 @@
</span><span class="cx"> PASS Calling respond() with a positive infinity bytesWritten value should throw a RangeError
</span><span class="cx"> PASS Calling respond() with a bytesWritten value different from 0 when stream is closed should throw a TypeError
</span><span class="cx"> PASS Calling respond() with a bytesWritten value of 0 when stream is closed should succeed
</span><ins>+PASS Calling respond() with a bytesWritten value greater than autoAllocateChunkSize should fail
+PASS Calling respond() with a bytesWritten value lower than autoAllocateChunkSize should succeed
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreadablestreambyobrequestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/readable-stream-byob-request.js (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/readable-stream-byob-request.js 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/LayoutTests/streams/readable-stream-byob-request.js 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -198,4 +198,47 @@
</span><span class="cx">
</span><span class="cx"> }, "Calling respond() with a bytesWritten value of 0 when stream is closed should succeed");
</span><span class="cx">
</span><ins>+test(function() {
+
+ let controller;
+ const rs = new ReadableStream({
+ autoAllocateChunkSize: 16,
+ start: function(c) {
+ controller = c;
+ },
+ type: "bytes"
+ });
+
+ rs.getReader().read();
+ const byobReq = controller.byobRequest;
+ assert_throws(new RangeError("bytesWritten value is too great"),
+ function() { byobReq.respond(17); });
+
+}, "Calling respond() with a bytesWritten value greater than autoAllocateChunkSize should fail");
+
+promise_test(function() {
+
+ const rs = new ReadableStream({
+ autoAllocateChunkSize: 16,
+ pull: function(controller) {
+ const br = controller.byobRequest;
+ br.view[0] = 1;
+ br.view[1] = 2;
+ br.respond(2);
+ },
+ type: "bytes"
+ });
+
+ return rs.getReader().read().then(result => {
+ assert_equals(result.value.byteLength, 2);
+ assert_equals(result.value.byteOffset, 0);
+ assert_equals(result.value.buffer.byteLength, 16);
+ assert_equals(result.value[0], 1);
+ assert_equals(result.value[1], 2);
+ });
+}, "Calling respond() with a bytesWritten value lower than autoAllocateChunkSize should succeed");
+
+// FIXME: when ReadableStreamBYOBReader is implemented, add tests with elementSize different from 1
+// so that more code can be covered.
+
</ins><span class="cx"> done();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/Source/WebCore/ChangeLog 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-03-22 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement ReadableStreamBYOBRequest respond() (readable stream state)
+ https://bugs.webkit.org/show_bug.cgi?id=169759
+
+ Reviewed by Youenn Fablet.
+
+ Implemented readable state part of respond() function. Parts of code cannot
+ currently be reached as they require ReadableStreamBYOBReader to be implemented.
+
+ Added new tests and updated expectations.
+
+ * Modules/streams/ReadableByteStreamInternals.js:
+ (readableByteStreamControllerEnqueue): Name shortened.
+ (readableByteStreamControllerRespondInternal): Updated with readable state case.
+ (cloneArrayBuffer): Added.
+ (readableByteStreamControllerRespondInReadableState): Added.
+ (readableByteStreamControllerRespondInClosedState): Updated.
+ (readableByteStreamControllerProcessPullDescriptors): Added.
+ (readableByteStreamControllerFillDescriptorFromQueue): Added.
+ (readableByteStreamControllerShiftPendingDescriptor): Name shortened.
+ (readableByteStreamControllerCommitDescriptor): Name shortened.
+ (readableByteStreamControllerConvertDescriptor): Name shortened.
+
</ins><span class="cx"> 2017-03-22 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> RTCPeerConnection is crashing if no backend is created
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableByteStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js (214264 => 214265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2017-03-22 18:04:19 UTC (rev 214264)
+++ trunk/Source/WebCore/Modules/streams/ReadableByteStreamInternals.js 2017-03-22 18:07:49 UTC (rev 214265)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">
</span><span class="cx"> if (@readableStreamHasDefaultReader(stream)) {
</span><span class="cx"> if (!stream.@reader.@readRequests.length)
</span><del>- @readableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
</del><ins>+ @readableByteStreamControllerEnqueueChunk(controller, transferredBuffer, byteOffset, byteLength);
</ins><span class="cx"> else {
</span><span class="cx"> @assert(!controller.@queue.length);
</span><span class="cx"> let transferredView = new @Uint8Array(transferredBuffer, byteOffset, byteLength);
</span><span class="lines">@@ -331,10 +331,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @assert(!@isReadableStreamLocked(stream));
</span><del>- @readableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
</del><ins>+ @readableByteStreamControllerEnqueueChunk(controller, transferredBuffer, byteOffset, byteLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function readableByteStreamControllerEnqueueChunkToQueue(controller, buffer, byteOffset, byteLength)
</del><ins>+// Spec name: readableByteStreamControllerEnqueueChunkToQueue.
+function readableByteStreamControllerEnqueueChunk(controller, buffer, byteOffset, byteLength)
</ins><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="lines">@@ -372,12 +373,51 @@
</span><span class="cx"> @throwTypeError("bytesWritten is different from 0 even though stream is closed");
</span><span class="cx"> @readableByteStreamControllerRespondInClosedState(controller, firstDescriptor);
</span><span class="cx"> } else {
</span><del>- // FIXME: Also implement case of readable state (distinct patch to avoid adding too many different cases
- // in a single patch).
- @throwTypeError("Readable state is not yet supported");
</del><ins>+ @assert(stream.@state === @streamReadable);
+ @readableByteStreamControllerRespondInReadableState(controller, bytesWritten, firstDescriptor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function cloneArrayBuffer(srcBuffer, srcByteOffset, srcLength)
+{
+ "use strict";
+
+ // FIXME: Below implementation returns the appropriate data but does not perform
+ // exactly what is described by ECMAScript CloneArrayBuffer operation. This should
+ // be fixed in a follow up patch implementing cloneArrayBuffer in JSC (similarly to
+ // structuredCloneArrayBuffer implementation).
+ return srcBuffer.slice(srcByteOffset, srcByteOffset + srcLength);
+}
+
+function readableByteStreamControllerRespondInReadableState(controller, bytesWritten, pullIntoDescriptor)
+{
+ "use strict";
+
+ if (pullIntoDescriptor.bytesFilled + bytesWritten > pullIntoDescriptor.byteLength)
+ @throwRangeError("bytesWritten value is too great");
+
+ @assert(controller.@pendingPullIntos.length === 0 || controller.@pendingPullIntos[0] === pullIntoDescriptor);
+ @readableByteStreamControllerInvalidateBYOBRequest(controller);
+ pullIntoDescriptor.bytesFilled += bytesWritten;
+
+ if (pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize)
+ return;
+
+ @readableByteStreamControllerShiftPendingDescriptor(controller);
+ const remainderSize = pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize;
+
+ if (remainderSize > 0) {
+ const end = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
+ const remainder = @cloneArrayBuffer(pullIntoDescriptor.buffer, end - remainderSize, remainderSize);
+ @readableByteStreamControllerEnqueueChunk(controller, remainder, 0, remainder.byteLength);
+ }
+
+ pullIntoDescriptor.buffer = @transferBufferToCurrentRealm(pullIntoDescriptor.buffer);
+ pullIntoDescriptor.bytesFilled -= remainderSize;
+ @readableByteStreamControllerCommitDescriptor(controller.@controlledReadableStream, pullIntoDescriptor);
+ @readableByteStreamControllerProcessPullDescriptors(controller);
+}
+
</ins><span class="cx"> function readableByteStreamControllerRespondInClosedState(controller, firstDescriptor)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="lines">@@ -393,15 +433,90 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> while (controller.@reader.@readIntoRequests.length > 0) {
</span><del>- let pullIntoDescriptor = @readableByteStreamControllerShiftPendingPullInto(controller);
- @readableByteStreamControllerCommitPullIntoDescriptor(controller.@controlledReadableStream, pullIntoDescriptor);
</del><ins>+ let pullIntoDescriptor = @readableByteStreamControllerShiftPendingDescriptor(controller);
+ @readableByteStreamControllerCommitDescriptor(controller.@controlledReadableStream, pullIntoDescriptor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function readableByteStreamControllerShiftPendingPullInto(controller)
</del><ins>+// Spec name: readableByteStreamControllerProcessPullIntoDescriptorsUsingQueue (shortened for readability).
+function readableByteStreamControllerProcessPullDescriptors(controller)
</ins><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><ins>+ @assert(!controller.@closeRequested);
+ while (controller.@pendingPullIntos.length > 0) {
+ if (controller.@totalQueuedBytes === 0)
+ return;
+ let pullIntoDescriptor = controller.@pendingPullIntos[0];
+ if (@readableByteStreamControllerFillDescriptorFromQueue(controller, pullIntoDescriptor)) {
+ @readableByteStreamControllerShiftPendingDescriptor(controller);
+ @readableByteStreamControllerCommitDescriptor(controller.@controlledReadableStream, pullIntoDescriptor);
+ }
+ }
+}
+
+// Spec name: readableByteStreamControllerFillPullIntoDescriptorFromQueue (shortened for readability).
+function readableByteStreamControllerFillDescriptorFromQueue(controller, pullIntoDescriptor)
+{
+ "use strict";
+
+ const currentAlignedBytes = pullIntoDescriptor.bytesFilled - (pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize);
+ const maxBytesToCopy = controller.@totalQueuedBytes < pullIntoDescriptor.byteLength - pullIntoDescriptor.bytesFilled ?
+ controller.@totalQueuedBytes : pullIntoDescriptor.byteLength - pullIntoDescriptor.bytesFilled;
+ const maxBytesFilled = pullIntoDescriptor.bytesFilled + maxBytesToCopy;
+ const maxAlignedBytes = maxBytesFilled - (maxBytesFilled % pullIntoDescriptor.elementSize);
+ let totalBytesToCopyRemaining = maxBytesToCopy;
+ let ready = false;
+
+ if (maxAlignedBytes > currentAlignedBytes) {
+ totalBytesToCopyRemaining = maxAlignedBytes - pullIntoDescriptor.bytesFilled;
+ ready = true;
+ }
+
+ while (totalBytesToCopyRemaining > 0) {
+ let headOfQueue = controller.@queue[0];
+ const bytesToCopy = totalBytesToCopyRemaining < headOfQueue.byteLength ? totalBytesToCopyRemaining : headOfQueue.byteLength;
+ // Copy appropriate part of pullIntoDescriptor.buffer to headOfQueue.buffer.
+ // Remark: this implementation is not completely aligned on the definition of CopyDataBlockBytes
+ // operation of ECMAScript (the case of Shared Data Block is not considered here, but it doesn't seem to be an issue).
+ let fromIndex = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
+ let count = bytesToCopy;
+ let toIndex = headOfQueue.byteOffset;
+ while (count > 0) {
+ headOfQueue.buffer[toIndex] = pullIntoDescriptor.buffer[fromIndex];
+ toIndex++;
+ fromIndex++;
+ count--;
+ }
+
+ if (headOfQueue.byteLength === bytesToCopy)
+ controller.@queue.@shift();
+ else {
+ headOfQueue.byteOffset += bytesToCopy;
+ headOfQueue.byteLength -= bytesToCopy;
+ }
+
+ controller.@totalQueuedBytes -= bytesToCopy;
+ @assert(controller.@pendingPullIntos.length === 0 || controller.@pendingPullIntos[0] === pullIntoDescriptor);
+ @readableByteStreamControllerInvalidateBYOBRequest(controller);
+ pullIntoDescriptor.bytesFilled += bytesToCopy;
+ totalBytesToCopyRemaining -= bytesToCopy;
+ }
+
+ if (!ready) {
+ @assert(controller.@totalQueuedBytes === 0);
+ @assert(pullIntoDescriptor.bytesFilled > 0);
+ @assert(pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize);
+ }
+
+ return ready;
+}
+
+// Spec name: readableByteStreamControllerShiftPendingPullInto (renamed for consistency).
+function readableByteStreamControllerShiftPendingDescriptor(controller)
+{
+ "use strict";
+
</ins><span class="cx"> let descriptor = controller.@pendingPullIntos.@shift();
</span><span class="cx"> @readableByteStreamControllerInvalidateBYOBRequest(controller);
</span><span class="cx"> return descriptor;
</span><span class="lines">@@ -418,7 +533,8 @@
</span><span class="cx"> controller.@byobRequest = @undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function readableByteStreamControllerCommitPullIntoDescriptor(stream, pullIntoDescriptor)
</del><ins>+// Spec name: readableByteStreamControllerCommitPullIntoDescriptor (shortened for readability).
+function readableByteStreamControllerCommitDescriptor(stream, pullIntoDescriptor)
</ins><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="lines">@@ -428,7 +544,7 @@
</span><span class="cx"> @assert(!pullIntoDescriptor.bytesFilled);
</span><span class="cx"> done = true;
</span><span class="cx"> }
</span><del>- let filledView = @readableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
</del><ins>+ let filledView = @readableByteStreamControllerConvertDescriptor(pullIntoDescriptor);
</ins><span class="cx"> if (pullIntoDescriptor.readerType === "default")
</span><span class="cx"> @readableStreamFulfillReadRequest(stream, filledView, done);
</span><span class="cx"> else {
</span><span class="lines">@@ -437,11 +553,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function readableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor)
</del><ins>+// Spec name: readableByteStreamControllerConvertPullIntoDescriptor (shortened for readability).
+function readableByteStreamControllerConvertDescriptor(pullIntoDescriptor)
</ins><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- @assert(pullIntoDescriptor.bytesFilled <= pullIntoDescriptor.bytesLength);
</del><ins>+ @assert(pullIntoDescriptor.bytesFilled <= pullIntoDescriptor.byteLength);
</ins><span class="cx"> @assert(pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize === 0);
</span><span class="cx">
</span><span class="cx"> return new pullIntoDescriptor.ctor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, pullIntoDescriptor.bytesFilled / pullIntoDescriptor.elementSize);
</span></span></pre>
</div>
</div>
</body>
</html>