[Streams API] Remove ReadableStreamController.enqueue() custom binding

https://bugs.webkit.org/show_bug.cgi?id=146455

Reviewed by Darin Adler.

Made enqueue not custom. Updated error to use Default=Undefined in IDL.

No change in behavior.

* Modules/streams/ReadableStreamController.h:
(WebCore::ReadableStreamController::error): Removed unneeded variation of error.
(WebCore::ReadableStreamController::enqueue): Calling ReadableJSStream enqueue method.
* Modules/streams/ReadableStreamController.idl: Updated error with Default=Undefined and made enqueue not custom.
* bindings/js/JSDOMBinding.cpp:
(WebCore::createDOMException): Adding support for RangeError exceptions.
* bindings/js/JSReadableStreamControllerCustom.cpp:
(WebCore::constructJSReadableStreamController): Deleted.
* bindings/js/ReadableJSStream.cpp:
(WebCore::ReadableJSStream::error): Updated to pass error value as parameter.
(WebCore::ReadableJSStream::enqueue): Added exception throwing through ExceptionCode.
(WebCore::ReadableJSStream::retrieveChunkSize): Ditto.
* bindings/js/ReadableJSStream.h:
* dom/ExceptionCode.h: Adding RangeError.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 33fee24b4ac1de5e9dd6330528c9ef643452a736..99ac1cd5eb67050d8e0e489343f4b5f11c6e36ca 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2015-07-02  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        [Streams API] Remove ReadableStreamController.enqueue() custom binding
+        https://bugs.webkit.org/show_bug.cgi?id=146455
+
+        Reviewed by Darin Adler.
+
+        Made enqueue not custom. Updated error to use Default=Undefined in IDL.
+
+        No change in behavior.
+
+        * Modules/streams/ReadableStreamController.h:
+        (WebCore::ReadableStreamController::error): Removed unneeded variation of error.
+        (WebCore::ReadableStreamController::enqueue): Calling ReadableJSStream enqueue method.
+        * Modules/streams/ReadableStreamController.idl: Updated error with Default=Undefined and made enqueue not custom.
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::createDOMException): Adding support for RangeError exceptions.
+        * bindings/js/JSReadableStreamControllerCustom.cpp:
+        (WebCore::constructJSReadableStreamController): Deleted.
+        * bindings/js/ReadableJSStream.cpp:
+        (WebCore::ReadableJSStream::error): Updated to pass error value as parameter.
+        (WebCore::ReadableJSStream::enqueue): Added exception throwing through ExceptionCode.
+        (WebCore::ReadableJSStream::retrieveChunkSize): Ditto.
+        * bindings/js/ReadableJSStream.h:
+        * dom/ExceptionCode.h: Adding RangeError.
+
 2015-07-02  Brady Eidson  <beidson@apple.com>
 
         [Content Extensions] Block synchronous XMLHTTPRequest.

diff --git a/Source/WebCore/Modules/streams/ReadableStreamController.h b/Source/WebCore/Modules/streams/ReadableStreamController.h
index 6f21f29cb6efaa07ca4155ec8e4324a8bc1f9f0a..a4c3becbb1d77d38c8e93c84f486339ef74e3e6f 100644 (file)
--- a/Source/WebCore/Modules/streams/ReadableStreamController.h
+++ b/Source/WebCore/Modules/streams/ReadableStreamController.h
@@ -48,8 +48,9 @@ public:
 
     ReadableJSStream& stream() { return m_stream; }
 
-    void error(JSC::ExecState* state, ExceptionCode& ec) { m_stream.error(*state, ec); }
-    void error(JSC::ExecState* state, JSC::JSValue, ExceptionCode& ec) { m_stream.error(*state, ec); }
+    void error(JSC::ExecState* state, JSC::JSValue value, ExceptionCode& ec) { m_stream.error(*state, value, ec); }
+
+    void enqueue(JSC::ExecState* state, JSC::JSValue value) { m_stream.enqueue(*state, value); }
 
     void ref() { m_stream.ref(); }
     void deref() { m_stream.deref(); }

diff --git a/Source/WebCore/Modules/streams/ReadableStreamController.idl b/Source/WebCore/Modules/streams/ReadableStreamController.idl
index 57f5666316dbcb1d48e5c0440f05de4ac888b430..30b8c8b5e97718a14fdbbdce9c635a6f674e8555 100644 (file)
--- a/Source/WebCore/Modules/streams/ReadableStreamController.idl
+++ b/Source/WebCore/Modules/streams/ReadableStreamController.idl
@@ -33,9 +33,9 @@
     ImplementationLacksVTable,
     NoInterfaceObject
 ] interface ReadableStreamController {
-    [Custom, RaisesException] boolean enqueue(any chunk);
+    [CallWith=ScriptState] void enqueue([Default=Undefined] optional any chunk);
     [RaisesException] void close();
-    [CallWith=ScriptState, RaisesException] void error(optional any error);
+    [CallWith=ScriptState, RaisesException] void error([Default=Undefined] optional any error);
 
     readonly attribute double desiredSize;
 };

diff --git a/Source/WebCore/bindings/js/JSDOMBinding.cpp b/Source/WebCore/bindings/js/JSDOMBinding.cpp
index 1b6454d4c9c4aa215498d0652b81155a7299b1f2..5a41b467e2250dd99c171bc60541f2c1c4772d97 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMBinding.cpp
+++ b/Source/WebCore/bindings/js/JSDOMBinding.cpp
@@ -224,6 +224,9 @@ JSValue createDOMException(ExecState* exec, ExceptionCode ec)
     // FIXME: Handle other WebIDL exception types.
     if (ec == TypeError)
         return createTypeError(exec);
+    if (ec == RangeError)
+        return createRangeError(exec, ASCIILiteral("Bad value"));
+
 
     // FIXME: All callers to setDOMException need to pass in the right global object
     // for now, we're going to assume the lexicalGlobalObject.  Which is wrong in cases like this:

diff --git a/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp b/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp
index 14cc1666bdf1cddcfbe28b42526f202b1df2e9f1..3817e33c7cfbfbd8f702237558d730f8032b80af 100644 (file)
--- a/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp
+++ b/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp
@@ -40,17 +40,6 @@ using namespace JSC;
 
 namespace WebCore {
 
-JSValue JSReadableStreamController::enqueue(ExecState* exec)
-{
-    ReadableJSStream& stream = impl().stream();
-    if (stream.isErrored())
-        return exec->vm().throwException(exec, stream.error());
-    if (stream.isCloseRequested())
-        return exec->vm().throwException(exec, createTypeError(exec, ASCIILiteral("Calling enqueue on a stream which is closing")));
-    stream.enqueue(*exec);
-    return jsUndefined();
-}
-
 EncodedJSValue JSC_HOST_CALL constructJSReadableStreamController(ExecState* exec)
 {
     return throwVMError(exec, createTypeError(exec, ASCIILiteral("ReadableStreamController constructor should not be called directly")));

diff --git a/Source/WebCore/bindings/js/ReadableJSStream.cpp b/Source/WebCore/bindings/js/ReadableJSStream.cpp
index a7d21b2ebc1024001550999dfbe9d8da1e3fe27a..5381254c0e98f8539b7802b418ee895bc774d2c4 100644 (file)
--- a/Source/WebCore/bindings/js/ReadableJSStream.cpp
+++ b/Source/WebCore/bindings/js/ReadableJSStream.cpp
@@ -298,13 +298,13 @@ void ReadableJSStream::close(ExceptionCode& ec)
     changeStateToClosed();
 }
 
-void ReadableJSStream::error(JSC::ExecState& state, ExceptionCode& ec)
+void ReadableJSStream::error(JSC::ExecState& state, JSC::JSValue value, ExceptionCode& ec)
 {
     if (!isReadable()) {
         ec = TypeError;
         return;
     }
-    storeError(state, state.argument(0));
+    storeError(state, value);
 }
 
 void ReadableJSStream::storeException(JSC::ExecState& state)
@@ -338,24 +338,27 @@ JSValue ReadableJSStream::read()
     return chunk.value.get();
 }
 
-void ReadableJSStream::enqueue(ExecState& state)
+void ReadableJSStream::enqueue(JSC::ExecState& state, JSC::JSValue chunk)
 {
-    ASSERT(!isCloseRequested());
-
+    if (isErrored()) {
+        throwVMError(&state, error());
+        return;
+    }
+    if (isCloseRequested()) {
+        throwVMError(&state, createDOMException(&state, TypeError));
+        return;
+    }
     if (!isReadable())
         return;
 
-    JSValue chunk = state.argument(0);
     if (resolveReadCallback(chunk)) {
         pull();
         return;
     }
 
     double size = retrieveChunkSize(state, chunk);
-    if (state.hadException()) {
-        storeError(state, state.exception()->value());
+    if (state.hadException())
         return;
-    }
 
     m_chunkQueue.append({ JSC::Strong<JSC::Unknown>(state.vm(), chunk), size });
     m_totalQueueSize += size;
@@ -372,15 +375,20 @@ double ReadableJSStream::retrieveChunkSize(ExecState& state, JSValue chunk)
     arguments.append(chunk);
 
     JSValue sizeValue = callFunction(state, m_sizeFunction.get(), jsUndefined(), arguments);
-    if (state.hadException())
+    if (state.hadException()) {
+        storeError(state, state.exception()->value());
         return 0;
+    }
 
     double size = sizeValue.toNumber(&state);
-    if (state.hadException())
+    if (state.hadException()) {
+        storeError(state, state.exception()->value());
         return 0;
+    }
 
     if (!std::isfinite(size) || size < 0) {
-        throwVMError(&state, createRangeError(&state, ASCIILiteral("Incorrect double value")));
+        storeError(state, createDOMException(&state, RangeError));
+        throwVMError(&state, error());
         return 0;
     }
 

diff --git a/Source/WebCore/bindings/js/ReadableJSStream.h b/Source/WebCore/bindings/js/ReadableJSStream.h
index 15fde3263fdd2e3259a1e48c9c1a960a0f38ebf6..4eaa4932ea0fd168b65d4c8c35e41a14638831a7 100644 (file)
--- a/Source/WebCore/bindings/js/ReadableJSStream.h
+++ b/Source/WebCore/bindings/js/ReadableJSStream.h
@@ -62,8 +62,8 @@ public:
     void storeError(JSC::ExecState&, JSC::JSValue);
     JSC::JSValue error() override { return m_error.get(); }
 
-    void enqueue(JSC::ExecState&);
-    void error(JSC::ExecState&, ExceptionCode&);
+    void enqueue(JSC::ExecState&, JSC::JSValue);
+    void error(JSC::ExecState&, JSC::JSValue, ExceptionCode&);
 
     double desiredSize() const { return m_highWaterMark - m_totalQueueSize; }
 

diff --git a/Source/WebCore/dom/ExceptionCode.h b/Source/WebCore/dom/ExceptionCode.h
index 9bb406400430596e0cb1bcb2449f63488d001ff8..4325b83e790b47e98ea65564ce054452373f1528 100644 (file)
--- a/Source/WebCore/dom/ExceptionCode.h
+++ b/Source/WebCore/dom/ExceptionCode.h
@@ -65,6 +65,7 @@ namespace WebCore {
         // WebIDL exception types, handled by the binding layer.
         // FIXME: Add GeneralError, EvalError, etc. when implemented in the bindings.
         TypeError = 105,
+        RangeError = 106,
     };
 
 } // namespace WebCore