<!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>[206912] 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/206912">206912</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-07 08:10:46 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Readable Streams API] Implement generic reader functions
https://bugs.webkit.org/show_bug.cgi?id=163003
Patch by Romain Bellessort <romain.bellessort@crf.canon.fr> on 2016-10-07
Reviewed by Darin Adler.
Implements reader generic functions defined by spec in order to prepare BYOBReader integration.
Generic functions factorize some code that is used by both DefaultReader and BYOBReader.
No change in behaviour.
* Modules/streams/ReadableStreamDefaultReader.js:
(cancel): Rely on readableStreamReaderGenericCancel.
(releaseLock): Rely on readableStreamReaderGenericRelease.
* Modules/streams/ReadableStreamInternals.js:
(privateInitializeReadableStreamDefaultReader): Rely on readableStreamReaderGenericInitialize.
(readableStreamReaderGenericInitialize): Added.
(readableStreamReaderGenericCancel): Added.
(readableStreamReaderGenericRelease): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamDefaultReaderjs">trunk/Source/WebCore/Modules/streams/ReadableStreamDefaultReader.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206911 => 206912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-07 15:00:57 UTC (rev 206911)
+++ trunk/Source/WebCore/ChangeLog 2016-10-07 15:10:46 UTC (rev 206912)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-07 Romain Bellessort <romain.bellessort@crf.canon.fr>
+
+ [Readable Streams API] Implement generic reader functions
+ https://bugs.webkit.org/show_bug.cgi?id=163003
+
+ Reviewed by Darin Adler.
+
+ Implements reader generic functions defined by spec in order to prepare BYOBReader integration.
+ Generic functions factorize some code that is used by both DefaultReader and BYOBReader.
+
+ No change in behaviour.
+
+ * Modules/streams/ReadableStreamDefaultReader.js:
+ (cancel): Rely on readableStreamReaderGenericCancel.
+ (releaseLock): Rely on readableStreamReaderGenericRelease.
+ * Modules/streams/ReadableStreamInternals.js:
+ (privateInitializeReadableStreamDefaultReader): Rely on readableStreamReaderGenericInitialize.
+ (readableStreamReaderGenericInitialize): Added.
+ (readableStreamReaderGenericCancel): Added.
+ (readableStreamReaderGenericRelease): Added.
+
</ins><span class="cx"> 2016-10-07 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Misc gardening: Use typedefs consistently and remove unused code
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamDefaultReaderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamDefaultReader.js (206911 => 206912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamDefaultReader.js 2016-10-07 15:00:57 UTC (rev 206911)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamDefaultReader.js 2016-10-07 15:10:46 UTC (rev 206912)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> if (!this.@ownerReadableStream)
</span><span class="cx"> return @Promise.@reject(new @TypeError("cancel() called on a reader owned by no readable stream"));
</span><span class="cx">
</span><del>- return @readableStreamCancel(this.@ownerReadableStream, reason);
</del><ins>+ return @readableStreamReaderGenericCancel(this, reason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function read()
</span><span class="lines">@@ -57,20 +57,13 @@
</span><span class="cx"> if (!@isReadableStreamDefaultReader(this))
</span><span class="cx"> throw @makeThisTypeError("ReadableStreamDefaultReader", "releaseLock");
</span><span class="cx">
</span><del>- const stream = this.@ownerReadableStream;
- if (!stream)
- return;
</del><ins>+ if (!this.@ownerReadableStream)
+ return;
</ins><span class="cx">
</span><span class="cx"> if (this.@readRequests.length)
</span><span class="cx"> @throwTypeError("There are still pending read requests, cannot release the lock");
</span><span class="cx">
</span><del>- if (stream.@state === @streamReadable)
- this.@closedPromiseCapability.@reject.@call(@undefined, new @TypeError("releasing lock of reader whose stream is still in readable state"));
- else
- this.@closedPromiseCapability = { @promise: @Promise.@reject(new @TypeError("reader released lock")) };
-
- stream.@reader = @undefined;
- this.@ownerReadableStream = null;
</del><ins>+ @readableStreamReaderGenericRelease(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function closed()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (206911 => 206912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2016-10-07 15:00:57 UTC (rev 206911)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2016-10-07 15:10:46 UTC (rev 206912)
</span><span class="lines">@@ -36,23 +36,28 @@
</span><span class="cx"> if (@isReadableStreamLocked(stream))
</span><span class="cx"> @throwTypeError("ReadableStream is locked");
</span><span class="cx">
</span><ins>+ @readableStreamReaderGenericInitialize(this, stream);
</ins><span class="cx"> this.@readRequests = [];
</span><del>- this.@ownerReadableStream = stream;
- stream.@reader = this;
- if (stream.@state === @streamReadable) {
- this.@closedPromiseCapability = @newPromiseCapability(@Promise);
- return this;
- }
- if (stream.@state === @streamClosed) {
- this.@closedPromiseCapability = { @promise: @Promise.@resolve() };
- return this;
- }
- @assert(stream.@state === @streamErrored);
- this.@closedPromiseCapability = { @promise: @Promise.@reject(stream.@storedError) };
</del><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function readableStreamReaderGenericInitialize(reader, stream)
+{
+ "use strict";
+
+ reader.@ownerReadableStream = stream;
+ stream.@reader = reader;
+ if (stream.@state === @streamReadable)
+ reader.@closedPromiseCapability = @newPromiseCapability(@Promise);
+ else if (stream.@state === @streamClosed)
+ reader.@closedPromiseCapability = { @promise: @Promise.@resolve() };
+ else {
+ @assert(stream.@state === @streamErrored);
+ reader.@closedPromiseCapability = { @promise: @Promise.@reject(stream.@storedError) };
+ }
+}
+
</ins><span class="cx"> function privateInitializeReadableStreamDefaultController(stream, underlyingSource, size, highWaterMark)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="lines">@@ -323,6 +328,16 @@
</span><span class="cx"> return controller.@strategy.highWaterMark - controller.@queue.size;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+function readableStreamReaderGenericCancel(reader, reason)
+{
+ "use strict";
+
+ const stream = reader.@ownerReadableStream;
+ @assert(!!stream);
+ return @readableStreamCancel(stream, reason);
+}
+
</ins><span class="cx"> function readableStreamCancel(stream, reason)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="lines">@@ -460,3 +475,19 @@
</span><span class="cx"> @assert(@isReadableStream(stream));
</span><span class="cx"> return stream.@disturbed;
</span><span class="cx"> }
</span><ins>+
+function readableStreamReaderGenericRelease(reader)
+{
+ "use strict";
+
+ @assert(!!reader.@ownerReadableStream);
+ @assert(reader.@ownerReadableStream.@reader === reader);
+
+ if (reader.@ownerReadableStream.@state === @streamReadable)
+ reader.@closedPromiseCapability.@reject.@call(@undefined, new @TypeError("releasing lock of reader whose stream is still in readable state"));
+ else
+ reader.@closedPromiseCapability = { @promise: @Promise.@reject(new @TypeError("reader released lock")) };
+
+ reader.@ownerReadableStream.@reader = @undefined;
+ reader.@ownerReadableStream = null;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>