T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js-polyfill: support Safari, which doesn't have instantiateStreaming

Browse Source
This commit is contained in:
Zhuowei Zhang
2019-05-06 18:08:33 -07:00
committed by Dan Gohman
parent 072b2e8697
commit ca8c8b3370
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wasmtime-wasi/js-polyfill/polyfill.c
View File

@@ -26,7 +26,7 @@ void handleFiles(void) {
let file = document.getElementById('input').files[0]; \ let file = document.getElementById('input').files[0]; \
let file_with_mime_type = file.slice(0, file.size, 'application/wasm'); \ let file_with_mime_type = file.slice(0, file.size, 'application/wasm'); \
let response = new Response(file_with_mime_type); \ let response = new Response(file_with_mime_type); \
WebAssembly.instantiateStreaming(response, imports) \ wasi_instantiateStreaming(response, imports) \
.then(obj => { \ .then(obj => { \
setInstance(obj.instance); \ setInstance(obj.instance); \
try { \ try { \

11
wasmtime-wasi/js-polyfill/wasi.js
View File

@@ -31,6 +31,17 @@ function handleWASIExit(e) {
} }
} }
// Safari doesn't have instantiateStreaming
function wasi_instantiateStreaming(response, imports) {
if (WebAssembly && WebAssembly.instantiateStreaming) {
return WebAssembly.instantiateStreaming(response, imports);
}
return response.arrayBuffer()
.then(function(buffer) {
return WebAssembly.instantiate(buffer, imports);
});
}
// The current guest wasm instance. // The current guest wasm instance.
var currentInstance; var currentInstance;