<!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>[186044] 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/186044">186044</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-06-28 05:39:48 -0700 (Sun, 28 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Add support for chunks with customized sizes
https://bugs.webkit.org/show_bug.cgi?id=146312
Reviewed by Darin Adler.
Source/WebCore:
Covered by rebased tests.
* bindings/js/ReadableJSStream.cpp:
(WebCore::ReadableJSStream::read): Decrement totalQueueSize with the chunk specific size.
(WebCore::ReadableJSStream::enqueue): Calls retrieveSize, enqueue chunk with its size and increment totalQueueSize.
(WebCore::ReadableJSStream::retrieveChunkSize): Calls size JS callback and convert it to double.
* bindings/js/ReadableJSStream.h:
LayoutTests:
* streams/reference-implementation/bad-strategies-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationbadstrategiesexpectedtxt">trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamcpp">trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamh">trunk/Source/WebCore/bindings/js/ReadableJSStream.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186043 => 186044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-28 12:16:15 UTC (rev 186043)
+++ trunk/LayoutTests/ChangeLog 2015-06-28 12:39:48 UTC (rev 186044)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-06-28 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Add support for chunks with customized sizes
+ https://bugs.webkit.org/show_bug.cgi?id=146312
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/bad-strategies-expected.txt:
+
</ins><span class="cx"> 2015-06-27 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> fast/canvas/webgl/tex-*.html flakily timeout on Mavericks Debug WK1
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationbadstrategiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt (186043 => 186044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt 2015-06-28 12:16:15 UTC (rev 186043)
+++ trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt 2015-06-28 12:39:48 UTC (rev 186044)
</span><span class="lines">@@ -1,22 +1,10 @@
</span><span class="cx">
</span><span class="cx"> PASS Readable stream: throwing strategy.size getter
</span><del>-FAIL Readable stream: throwing strategy.size method assert_throws: enqueue should throw the error function "function () { c.enqueue('a'); }" did not throw
</del><ins>+PASS Readable stream: throwing strategy.size method
</ins><span class="cx"> PASS Readable stream: throwing strategy.highWaterMark getter
</span><span class="cx"> PASS Readable stream: invalid strategy.highWaterMark
</span><span class="cx"> PASS Readable stream: negative strategy.highWaterMark
</span><del>-FAIL Readable stream: strategy.size returning NaN assert_equals: enqueue should throw a RangeError expected function "function RangeError() {
- [native code]
-}" but got function "function AssertionError(message)
- {
- this.messa..."
-FAIL Readable stream: strategy.size returning -Infinity assert_equals: enqueue should throw a RangeError expected function "function RangeError() {
- [native code]
-}" but got function "function AssertionError(message)
- {
- this.messa..."
-FAIL Readable stream: strategy.size returning +Infinity assert_equals: enqueue should throw a RangeError expected function "function RangeError() {
- [native code]
-}" but got function "function AssertionError(message)
- {
- this.messa..."
</del><ins>+PASS Readable stream: strategy.size returning NaN
+PASS Readable stream: strategy.size returning -Infinity
+PASS Readable stream: strategy.size returning +Infinity
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186043 => 186044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-28 12:16:15 UTC (rev 186043)
+++ trunk/Source/WebCore/ChangeLog 2015-06-28 12:39:48 UTC (rev 186044)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-28 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Add support for chunks with customized sizes
+ https://bugs.webkit.org/show_bug.cgi?id=146312
+
+ Reviewed by Darin Adler.
+
+ Covered by rebased tests.
+
+ * bindings/js/ReadableJSStream.cpp:
+ (WebCore::ReadableJSStream::read): Decrement totalQueueSize with the chunk specific size.
+ (WebCore::ReadableJSStream::enqueue): Calls retrieveSize, enqueue chunk with its size and increment totalQueueSize.
+ (WebCore::ReadableJSStream::retrieveChunkSize): Calls size JS callback and convert it to double.
+ * bindings/js/ReadableJSStream.h:
+
</ins><span class="cx"> 2015-06-28 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API]Remove ReadableStreamController.close custom binding
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp (186043 => 186044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-28 12:16:15 UTC (rev 186043)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-28 12:39:48 UTC (rev 186044)
</span><span class="lines">@@ -323,27 +323,61 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasValue());
</span><span class="cx">
</span><del>- return m_chunkQueue.takeFirst().get();
</del><ins>+ Chunk chunk = m_chunkQueue.takeFirst();
+ m_totalQueueSize -= chunk.size;
+
+ return chunk.value.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ReadableJSStream::enqueue(ExecState& exec)
</del><ins>+void ReadableJSStream::enqueue(ExecState& state)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!isCloseRequested());
</span><span class="cx">
</span><span class="cx"> if (!isReadable())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- JSValue chunk = exec.argumentCount() ? exec.argument(0) : jsUndefined();
</del><ins>+ JSValue chunk = state.argument(0);
</ins><span class="cx"> if (resolveReadCallback(chunk)) {
</span><span class="cx"> pull();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_chunkQueue.append(JSC::Strong<JSC::Unknown>(exec.vm(), chunk));
- // FIXME: Compute chunk size.
</del><ins>+ double size = retrieveChunkSize(state, chunk);
+ if (state.hadException()) {
+ storeError(state, state.exception()->value());
+ return;
+ }
+
+ m_chunkQueue.append({ JSC::Strong<JSC::Unknown>(state.vm(), chunk), size });
+ m_totalQueueSize += size;
+
</ins><span class="cx"> pull();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double ReadableJSStream::retrieveChunkSize(ExecState& state, JSValue chunk)
+{
+ if (!m_sizeFunction)
+ return 1;
+
+ MarkedArgumentBuffer arguments;
+ arguments.append(chunk);
+
+ JSValue sizeValue = callFunction(state, m_sizeFunction.get(), jsUndefined(), arguments);
+ if (state.hadException())
+ return 0;
+
+ double size = sizeValue.toNumber(&state);
+ if (state.hadException())
+ return 0;
+
+ if (!std::isfinite(size)) {
+ throwVMError(&state, createRangeError(&state, ASCIILiteral("Incorrect double value")));
+ return 0;
+ }
+
+ return size;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.h (186043 => 186044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.h 2015-06-28 12:16:15 UTC (rev 186043)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.h 2015-06-28 12:39:48 UTC (rev 186044)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> void enqueue(JSC::ExecState&);
</span><span class="cx">
</span><del>- double desiredSize() const { return m_highWaterMark - m_chunkQueue.size(); }
</del><ins>+ double desiredSize() const { return m_highWaterMark - m_totalQueueSize; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ReadableJSStream(ScriptExecutionContext&, JSC::ExecState&, JSC::JSObject*, double, JSC::JSFunction*);
</span><span class="lines">@@ -82,12 +82,21 @@
</span><span class="cx">
</span><span class="cx"> JSDOMGlobalObject* globalObject();
</span><span class="cx">
</span><ins>+ double retrieveChunkSize(JSC::ExecState&, JSC::JSValue);
+
</ins><span class="cx"> std::unique_ptr<ReadableStreamController> m_controller;
</span><span class="cx"> // FIXME: we should consider not using JSC::Strong, see https://bugs.webkit.org/show_bug.cgi?id=146278
</span><span class="cx"> JSC::Strong<JSC::Unknown> m_error;
</span><span class="cx"> JSC::Strong<JSC::JSFunction> m_errorFunction;
</span><span class="cx"> JSC::Strong<JSC::JSObject> m_source;
</span><del>- Deque<JSC::Strong<JSC::Unknown>> m_chunkQueue;
</del><ins>+
+ struct Chunk {
+ JSC::Strong<JSC::Unknown> value;
+ double size;
+ };
+ Deque<Chunk> m_chunkQueue;
+
+ double m_totalQueueSize { 0 };
</ins><span class="cx"> double m_highWaterMark;
</span><span class="cx"> JSC::Strong<JSC::JSFunction> m_sizeFunction;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>