Merge pull request #112 from MattMatic/Fix-JavaScript-browser-issues

khaledhosny · web-flow · commit ebb06e0e7d00 · 2024-12-19T21:56:41.000+02:00
Fix browser issues with 0.4.x
diff --git a/build.sh b/build.sh
@@ -16,6 +16,7 @@ em++ \
 	-DHB_EXPERIMENTAL_API \
 	--no-entry \
 	-s MODULARIZE \
+	-s EXPORT_NAME=createHarfBuzz \
 	-s EXPORTED_FUNCTIONS=@hb.symbols \
 	-s EXPORTED_RUNTIME_METHODS='["addFunction", "wasmMemory", "wasmExports"]' \
 	-s INITIAL_MEMORY=65MB \
diff --git a/examples/hbjs.example.html b/examples/hbjs.example.html
@@ -1,12 +1,15 @@
+<script src="../hb.js"></script>
 <script src="../hbjs.js"></script>
 <script src="hbjs.example.js"></script>
 <script>
-// instantiateStreaming isn't supported in Safari yet, see nohbjs.html
-WebAssembly.instantiateStreaming(fetch("../hb.wasm")).then(function (result) {
+
+let harfBuzzModule; // not really needed with the hbjs wrapper
+createHarfBuzz().then(hbmodule=>{
+  harfBuzzModule = hbmodule;
   fetch('../test/fonts/noto/NotoSans-Regular.ttf').then(function (x) {
     return x.arrayBuffer();
   }).then(function (blob) {
-    document.body.innerText = JSON.stringify(example(hbjs(result.instance), new Uint8Array(blob)), undefined, 2);
+    document.body.innerText = JSON.stringify(example(hbjs(hbmodule), new Uint8Array(blob)), undefined, 2);
     document.body.style.whiteSpace = 'pre';
   });
 });
diff --git a/examples/nohbjs.html b/examples/nohbjs.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
+<script src="../hb.js"></script>
 <script>
 var utf8Encoder = new TextEncoder("utf8");
 
-// We could use instantiateStreaming but it's not supported in Safari yet
-// https://bugs.webkit.org/show_bug.cgi?id=173105
-fetch("../hb.wasm").then(function (x) {
-  return x.arrayBuffer();
-}).then(function (wasm) {
-  return WebAssembly.instantiate(wasm);
-}).then(function (result) {
-  var exports = result.instance.exports;
+let harfBuzzModule;
+createHarfBuzz().then(hbmodule=>{
+  harfBuzzModule = hbmodule;
+  var exports = hbmodule.wasmExports;
 
   fetch('../test/fonts/noto/NotoSans-Regular.ttf').then(function (x) {
     return x.arrayBuffer();
