Changeset 186044 in webkit

Timestamp:

Jun 28, 2015 5:39:48 AM (9 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

[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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/streams/reference-implementation/bad-strategies-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ReadableJSStream.cpp (modified) (3 diffs)
• Source/WebCore/bindings/js/ReadableJSStream.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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:
+
 2015-06-27  David Kilzer  <ddkilzer@apple.com>
 

trunk/LayoutTests/streams/reference-implementation/bad-strategies-expected.txt

@@ -1 +1 @@
 
 PASS Readable stream: throwing strategy.size getter 
-FAIL Readable stream: throwing strategy.size method assert_throws: enqueue should throw the error function "function () { c.enqueue('a'); }" did not throw
+PASS Readable stream: throwing strategy.size method 
 PASS Readable stream: throwing strategy.highWaterMark getter 
 PASS Readable stream: invalid strategy.highWaterMark 
 PASS Readable stream: negative strategy.highWaterMark 
-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..."
+PASS Readable stream: strategy.size returning NaN 
+PASS Readable stream: strategy.size returning -Infinity 
+PASS Readable stream: strategy.size returning +Infinity 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2015-06-28  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp

@@ -324 +324 @@
     ASSERT(hasValue());
 
-    return m_chunkQueue.takeFirst().get();
-}
-
-void ReadableJSStream::enqueue(ExecState& exec)
+    Chunk chunk = m_chunkQueue.takeFirst();
+    m_totalQueueSize -= chunk.size;
+
+    return chunk.value.get();
+}
+
+void ReadableJSStream::enqueue(ExecState& state)
 {
     ASSERT(!isCloseRequested());
@@ -334 +337 @@
         return;
 
-    JSValue chunk = exec.argumentCount() ? exec.argument(0) : jsUndefined();
+    JSValue chunk = state.argument(0);
     if (resolveReadCallback(chunk)) {
         pull();
@@ -340 +343 @@
     }
 
-    m_chunkQueue.append(JSC::Strong<JSC::Unknown>(exec.vm(), chunk));
-    // FIXME: Compute chunk size.
+    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;
+
     pull();
 }
 
+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;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/bindings/js/ReadableJSStream.h

@@ -65 +65 @@
     void enqueue(JSC::ExecState&);
 
-    double desiredSize() const { return m_highWaterMark - m_chunkQueue.size(); }
+    double desiredSize() const { return m_highWaterMark - m_totalQueueSize; }
 
 private:
@@ -83 +83 @@
     JSDOMGlobalObject* globalObject();
 
+    double retrieveChunkSize(JSC::ExecState&, JSC::JSValue);
+
     std::unique_ptr<ReadableStreamController> m_controller;
     // FIXME: we should consider not using JSC::Strong, see https://bugs.webkit.org/show_bug.cgi?id=146278
@@ -88 +90 @@
     JSC::Strong<JSC::JSFunction> m_errorFunction;
     JSC::Strong<JSC::JSObject> m_source;
-    Deque<JSC::Strong<JSC::Unknown>> m_chunkQueue;
+
+    struct Chunk {
+        JSC::Strong<JSC::Unknown> value;
+        double size;
+    };
+    Deque<Chunk> m_chunkQueue;
+
+    double m_totalQueueSize { 0 };
     double m_highWaterMark;
     JSC::Strong<JSC::JSFunction> m_sizeFunction;