From 5d2c295600151528084537fe2380599499b0b340 Mon Sep 17 00:00:00 2001
From: Manish Jethani <code@manishjethani.io>
Date: Sat, 21 Aug 2021 17:03:53 +0530
Subject: [PATCH] Remove globals usage from hntrie.js (#3842)

---
 .jshintrc        |  3 ++-
 src/js/hntrie.js | 24 +++++++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 00f601999..5d43f6df9 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -12,7 +12,8 @@
 		"vAPI": false,
 		"webext": false,
 		"µBlock": false,
-		"URLSearchParams": false
+		"URLSearchParams": false,
+		"WebAssembly": false
 	},
 	"laxbreak": true,
 	"newcap": false,
diff --git a/src/js/hntrie.js b/src/js/hntrie.js
index 094bf0ea9..14a921373 100644
--- a/src/js/hntrie.js
+++ b/src/js/hntrie.js
@@ -19,7 +19,7 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* globals self */
+/* globals WebAssembly */
 
 'use strict';
 
@@ -450,28 +450,18 @@ const HNTrieContainer = class {
     }
 
     async enableWASM(wasmModuleFetcher, path) {
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis
-        const globals = (( ) => {
-            if ( typeof self !== 'undefined' ) { return self; }
-            // jshint ignore:start
-            if ( typeof globalThis !== 'undefined' ) { return globalThis; }
-            if ( typeof global !== 'undefined' ) { return global; }
-            // jshint ignore:end
-            return {};
-        })();
-        const WASM = globals.WebAssembly || null;
-        if ( WASM === null ) { return false; }
-        if ( this.wasmMemory instanceof WASM.Memory ) { return true; }
+        if ( typeof WebAssembly === 'undefined' ) { return false; }
+        if ( this.wasmMemory instanceof WebAssembly.Memory ) { return true; }
         const module = await getWasmModule(wasmModuleFetcher, path);
-        if ( module instanceof WASM.Module === false ) { return false; }
-        const memory = new WASM.Memory({ initial: 2 });
-        const instance = await WASM.instantiate(module, {
+        if ( module instanceof WebAssembly.Module === false ) { return false; }
+        const memory = new WebAssembly.Memory({ initial: 2 });
+        const instance = await WebAssembly.instantiate(module, {
             imports: {
                 memory,
                 growBuf: this.growBuf.bind(this, 24, 256)
             }
         });
-        if ( instance instanceof WASM.Instance === false ) { return false; }
+        if ( instance instanceof WebAssembly.Instance === false ) { return false; }
         this.wasmMemory = memory;
         const curPageCount = memory.buffer.byteLength >>> 16;
         const newPageCount = roundToPageSize(this.buf.byteLength) >>> 16;