Make WASM polyfilled Instant work in web workers.

rust-cv · Jul 20, 2023 · 8bb15fe · 8bb15fe
1 parent 82a25ee
commit 8bb15fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/akaze/Cargo.toml b/akaze/Cargo.toml
@@ -31,7 +31,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"], opti
 rayon = { version = "1.7.0", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-web-sys = { version = "0.3.64", features = ["Window", "Performance"], optional = true }
+web-sys = { version = "0.3.64", features = ["Window", "Performance", "WorkerGlobalScope"], optional = true }
 
 [dev-dependencies]
 eight-point = { version = "0.8.0", path = "../eight-point" }

diff --git a/akaze/src/lib.rs b/akaze/src/lib.rs
@@ -27,26 +27,21 @@ impl Instant {
     fn now() -> Self {
         #[cfg(feature = "web-sys")]
         {
-            Self(
-                web_sys::window()
-                    .and_then(|w| w.performance())
-                    .map_or(0., |p| p.now()),
-            )
+            use web_sys::wasm_bindgen::JsCast;
+            let now = web_sys::js_sys::global()
+                .dyn_into::<web_sys::WorkerGlobalScope>()
+                .and_then(|w| w.performance())
+                .or_else(|_| web_sys::window().and_then(|w| w.performance()))
+                .map_or(0., |p| p.now());
+            Self(now)
         }
         #[cfg(not(feature = "web-sys"))]
         {
             Self(0.)
         }
     }
     fn elapsed(&self) -> std::time::Duration {
-        #[cfg(feature = "web-sys")]
-        {
-            std::time::Duration::from_secs_f64((Self::now().0 - self.0) * 0.001)
-        }
-        #[cfg(not(feature = "web-sys"))]
-        {
-            std::time::Duration::from_secs(0)
-        }
+        std::time::Duration::from_secs_f64((Self::now().0 - self.0) * 0.001)
     }
 }