From a7a8ff0bbb85e52bf4165e4cd6d2a1e77959616c Mon Sep 17 00:00:00 2001 From: dAxpeDDa Date: Tue, 13 Jun 2023 09:58:23 +0200 Subject: [PATCH] Drop `pointerrawupdate` support --- CHANGELOG.md | 1 - src/platform_impl/web/web_sys/pointer.rs | 30 ++---------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eeefa31a..d8bcefc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,7 +69,6 @@ And please only add new entries to the top of this list, right below the `# Unre - On Web, fix touch input not gaining or loosing focus. - **Breaking:** On Web, dropped support for Safari versions below 13. - On Web, prevent clicks on the canvas to select text. -- On Web, use high-frequency pointer input events when supported by the browser. - On Web, `EventLoopProxy` now implements `Send`. - On Web, `Window` now implements `Send` and `Sync`. - **Breaking:** `WindowExtWebSys::canvas()` now returns an `Option`. diff --git a/src/platform_impl/web/web_sys/pointer.rs b/src/platform_impl/web/web_sys/pointer.rs index 8ee514e3..80146f0a 100644 --- a/src/platform_impl/web/web_sys/pointer.rs +++ b/src/platform_impl/web/web_sys/pointer.rs @@ -6,10 +6,9 @@ use crate::event::{Force, MouseButton}; use crate::keyboard::ModifiersState; use event::ButtonsState; -use once_cell::unsync::OnceCell; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsCast, JsValue}; -use web_sys::{HtmlCanvasElement, PointerEvent}; +use web_sys::PointerEvent; #[allow(dead_code)] pub(super) struct PointerHandler { @@ -191,11 +190,7 @@ impl PointerHandler { let window = canvas_common.window.clone(); let canvas = canvas_common.raw.clone(); self.on_cursor_move = Some(canvas_common.add_event( - if has_pointer_raw_support(&canvas) { - "pointerrawupdate" - } else { - "pointermove" - }, + "pointermove", move |event: PointerEvent| { // coalesced events are not available on Safari #[wasm_bindgen] @@ -311,24 +306,3 @@ impl PointerHandler { self.on_touch_cancel = None; } } - -fn has_pointer_raw_support(canvas: &HtmlCanvasElement) -> bool { - thread_local! { - static POINTER_RAW_SUPPORT: OnceCell = OnceCell::new(); - } - - POINTER_RAW_SUPPORT.with(|support| { - *support.get_or_init(|| { - #[wasm_bindgen] - extern "C" { - type HtmlCanvasElementExt; - - #[wasm_bindgen(method, getter, js_name = onpointerrawupdate)] - fn has_on_pointerrawupdate(this: &HtmlCanvasElementExt) -> JsValue; - } - - let canvas: &HtmlCanvasElementExt = canvas.unchecked_ref(); - !canvas.has_on_pointerrawupdate().is_undefined() - }) - }) -}