Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 1 commit into from
May 10, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion wasmtime-wasi/js-polyfill/polyfill.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void handleFiles(void) {
let file = document.getElementById('input').files[0]; \
let file_with_mime_type = file.slice(0, file.size, 'application/wasm'); \
let response = new Response(file_with_mime_type); \
WebAssembly.instantiateStreaming(response, imports) \
wasi_instantiateStreaming(response, imports) \
.then(obj => { \
setInstance(obj.instance); \
try { \
Expand Down
11 changes: 11 additions & 0 deletions wasmtime-wasi/js-polyfill/wasi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
var currentInstance;

Expand Down