Changeset 272221 in webkit

Timestamp:

Feb 2, 2021 10:30:42 AM (18 months ago)

Author:

ysuzuki@apple.com

Message:

WebAssembly: add support for stream APIs - JavaScript API: Implement loading for the Blob type
​https://bugs.webkit.org/show_bug.cgi?id=184886

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

• web-platform-tests/wasm/wasm_stream_compile_test-expected.txt:
• web-platform-tests/wasm/wasm_stream_compile_test.html:
• web-platform-tests/wasm/wasm_stream_instantiate_test-expected.txt:
• web-platform-tests/wasm/wasm_stream_instantiate_test.html:

Source/WebCore:

This patch adds compileStreaming / instantiateStreaming with FetchResponse created from Blob.
We materialize ReadableStream to load Blob for now. In the future, if more efficient way is
implemented, we will switch to that.
More complex FormData is not supported, tracked in ​https://bugs.webkit.org/show_bug.cgi?id=221248.

• bindings/js/JSDOMGlobalObject.cpp:

(WebCore::handleResponseOnStreamingAction):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_compile_test-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_compile_test.html (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_instantiate_test-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_instantiate_test.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-02-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        WebAssembly: add support for stream APIs - JavaScript API: Implement loading for the Blob type
+        https://bugs.webkit.org/show_bug.cgi?id=184886
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/wasm/wasm_stream_compile_test-expected.txt:
+        * web-platform-tests/wasm/wasm_stream_compile_test.html:
+        * web-platform-tests/wasm/wasm_stream_instantiate_test-expected.txt:
+        * web-platform-tests/wasm/wasm_stream_instantiate_test.html:
+
 2021-02-02  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_compile_test-expected.txt

@@ -10 +10 @@
 PASS compileStreaming receive promise with response created from ArrayBuffer
 PASS compileStreaming receive response that deliver data by chunks as bufferArray
+PASS compileStreaming using blob
+FAIL compileStreaming using FormData promise_rejects_js: function "function () { throw e }" threw object "TypeError: FormData is not supported" ("TypeError") expected instance of function "function CompileError() {
+    [native code]
+}" ("CompileError")
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_compile_test.html

@@ -106 +106 @@
     assert_true(module instanceof WebAssembly.Module);
   }, "compileStreaming receive response that deliver data by chunks as bufferArray");
+
+  promise_test(async function() {
+      var response = await fetch('resources/incrementer.wasm');
+      var blob = await response.blob();
+      const module = await WebAssembly.compileStreaming(new Response(blob, { headers: { "Content-Type" : "application/wasm" }}));
+      assert_true(module instanceof WebAssembly.Module);
+  }, "compileStreaming using blob");
+
+  promise_test(async function(t) {
+      var response = await fetch('resources/incrementer.wasm');
+      var blob = await response.blob();
+      var formData = new FormData;
+      formData.append('blob', blob);
+      formData.append('blob2', "Hello");
+      await promise_rejects_js(t, WebAssembly.CompileError, WebAssembly.compileStreaming(new Response(formData, { headers: { "Content-Type" : "application/wasm" }})));
+  }, "compileStreaming using FormData");
 </script>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_instantiate_test-expected.txt

@@ -10 +10 @@
 PASS instantiateStreaming receive promise with response created from ArrayBuffer
 PASS instantiateStreaming receive response that deliver data by chunks as bufferArray
+PASS instantiateStreaming using blob
+FAIL instantiateStreaming using FormData promise_rejects_js: function "function () { throw e }" threw object "TypeError: FormData is not supported" ("TypeError") expected instance of function "function CompileError() {
+    [native code]
+}" ("CompileError")
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/wasm_stream_instantiate_test.html

@@ -104 +104 @@
     assert_true(instance instanceof WebAssembly.Instance);
   }, "instantiateStreaming receive response that deliver data by chunks as bufferArray");
+
+  promise_test(async function() {
+      var response = await fetch('resources/incrementer.wasm');
+      var blob = await response.blob();
+      const { instance, module } = await WebAssembly.instantiateStreaming(new Response(blob, { headers: { "Content-Type" : "application/wasm" }}));
+      assert_true(instance instanceof WebAssembly.Instance);
+      assert_true(module instanceof WebAssembly.Module);
+  }, "instantiateStreaming using blob");
+
+  promise_test(async function(t) {
+      var response = await fetch('resources/incrementer.wasm');
+      var blob = await response.blob();
+      var formData = new FormData;
+      formData.append('blob', blob);
+      formData.append('blob2', "Hello");
+      await promise_rejects_js(t, WebAssembly.CompileError, WebAssembly.instantiateStreaming(new Response(formData, { headers: { "Content-Type" : "application/wasm" }})));
+  }, "instantiateStreaming using FormData");
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        WebAssembly: add support for stream APIs - JavaScript API: Implement loading for the Blob type
+        https://bugs.webkit.org/show_bug.cgi?id=184886
+
+        Reviewed by Youenn Fablet.
+
+        This patch adds compileStreaming / instantiateStreaming with FetchResponse created from Blob.
+        We materialize ReadableStream to load Blob for now. In the future, if more efficient way is
+        implemented, we will switch to that.
+        More complex FormData is not supported, tracked in https://bugs.webkit.org/show_bug.cgi?id=221248.
+
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::handleResponseOnStreamingAction):
+
 2021-02-02  Chris Dumez  <cdumez@apple.com>
 

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

@@ -340 +340 @@
     }
 
+    // FIXME: for efficiency, we should load blobs directly instead of going through the readableStream path.
+    if (inputResponse->isBlobBody()) {
+        auto streamOrException = inputResponse->readableStream(*globalObject);
+        if (UNLIKELY(streamOrException.hasException())) {
+            deferred->reject(streamOrException.releaseException());
+            return jsCast<JSC::JSPromise*>(deferred->promise());
+        }
+    }
+
     auto compiler = JSC::Wasm::StreamingCompiler::create(vm, compilerMode, globalObject, jsCast<JSC::JSPromise*>(deferred->promise()), importObject);
 
@@ -388 +397 @@
             return;
         }
-        // FIXME: http://webkit.org/b/184886> Implement loading for the Blob type
-        compiler->fail(globalObject, createTypeError(globalObject, "Blob is not supported"_s));
+        // FIXME: Support FormData loading.
+        // https://bugs.webkit.org/show_bug.cgi?id=221248
+        compiler->fail(globalObject, createDOMException(*globalObject, Exception { NotSupportedError, "Not implemented"_s  }));
     }, [&](Ref<SharedBuffer>& buffer) {
         compiler->addBytes(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());