@@ -63,8 +63,8 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
63
63
fn is_sab ( ) -> bool {
64
64
use core:: sync:: atomic:: { AtomicU8 , Ordering } ;
65
65
66
+ use js_sys:: Object ;
66
67
use js_sys:: WebAssembly :: Memory ;
67
- use js_sys:: { Object , SharedArrayBuffer } ;
68
68
use wasm_bindgen:: JsCast ;
69
69
70
70
const MEMORY_KIND_UNINIT : u8 = 0 ;
@@ -83,19 +83,9 @@ fn is_sab() -> bool {
83
83
// `SharedArrayBuffer` is only available with COOP & COEP. But even without its
84
84
// possible to create a shared `WebAssembly.Memory`, so we check for that via
85
85
// the constructor name.
86
- //
87
- // Keep in mind that `crossOriginIsolated` is not available on Node.js, in
88
- // which case we can still use `instanceof` because `SharedArrayBuffer` is
89
- // always available.
90
- let shared = match CROSS_ORIGIN_ISOLATED . with ( Option :: clone) {
91
- Some ( true ) | None => buffer. is_instance_of :: < SharedArrayBuffer > ( ) ,
92
- Some ( false ) => {
93
- let constructor_name = Object :: from ( buffer) . constructor ( ) . name ( ) ;
94
- SHARED_ARRAY_BUFFER_NAME . with ( |name| & constructor_name == name)
95
- }
96
- } ;
97
-
98
- let val = if shared {
86
+ let constructor_name = Object :: from ( buffer) . constructor ( ) . name ( ) ;
87
+ let val = if SHARED_ARRAY_BUFFER_NAME . with ( |sab_name| & constructor_name == sab_name)
88
+ {
99
89
MEMORY_KIND_SHARED
100
90
} else {
101
91
MEMORY_KIND_NOT_SHARED
@@ -126,9 +116,6 @@ extern "C" {
126
116
fn get_random_values ( this : & Crypto , buf : & Uint8Array ) -> Result < ( ) , JsValue > ;
127
117
#[ wasm_bindgen( method, js_name = getRandomValues, catch) ]
128
118
fn get_random_values_ref ( this : & Crypto , buf : & mut [ u8 ] ) -> Result < ( ) , JsValue > ;
129
- // Returns the [`crossOriginIsolated`](https://developer.mozilla.org/en-US/docs/Web/API/crossOriginIsolated) global property.
130
- #[ wasm_bindgen( thread_local_v2, js_namespace = globalThis, js_name = crossOriginIsolated) ]
131
- static CROSS_ORIGIN_ISOLATED : Option < bool > ;
132
119
#[ wasm_bindgen( thread_local_v2, static_string) ]
133
120
static SHARED_ARRAY_BUFFER_NAME : JsString = "SharedArrayBuffer" ;
134
121
}
0 commit comments