diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index cee460d4fa3..5dec5ff75f9 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1203,7 +1203,7 @@ impl Document { debug!("{}: at {:?}", mouse_event_type_string, client_point); let el = node_address.and_then(|address| { - let node = unsafe { node::from_untrusted_node_address(js_runtime, address) }; + let node = node::from_untrusted_node_address(js_runtime, address); node.inclusive_ancestors(ShadowIncluding::No) .filter_map(DomRoot::downcast::) .next() @@ -1398,7 +1398,7 @@ impl Document { pressed_mouse_buttons: u16, ) { let maybe_new_target = node_address.and_then(|address| { - let node = unsafe { node::from_untrusted_node_address(js_runtime, address) }; + let node = node::from_untrusted_node_address(js_runtime, address); node.inclusive_ancestors(ShadowIncluding::No) .filter_map(DomRoot::downcast::) .next() @@ -1573,7 +1573,7 @@ impl Document { debug!("{}: at {:?}", wheel_event_type_string, client_point); let el = node_address.and_then(|address| { - let node = unsafe { node::from_untrusted_node_address(js_runtime, address) }; + let node = node::from_untrusted_node_address(js_runtime, address); node.inclusive_ancestors(ShadowIncluding::No) .filter_map(DomRoot::downcast::) .next() @@ -1627,7 +1627,7 @@ impl Document { }; let el = node_address.and_then(|address| { - let node = unsafe { node::from_untrusted_node_address(js_runtime, address) }; + let node = node::from_untrusted_node_address(js_runtime, address); node.inclusive_ancestors(ShadowIncluding::No) .filter_map(DomRoot::downcast::) .next() diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 68bbc524764..68fef98b091 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -3525,13 +3525,15 @@ impl ScriptThread { // Get the previous target temporarily let prev_mouse_over_target = self.topmost_mouse_over_target.get(); - document.handle_mouse_move_event( - self.js_runtime.rt(), - point, - &self.topmost_mouse_over_target, - node_address, - pressed_mouse_buttons, - ); + unsafe { + document.handle_mouse_move_event( + self.js_runtime.rt(), + point, + &self.topmost_mouse_over_target, + node_address, + pressed_mouse_buttons, + ) + } // Short-circuit if nothing changed if self.topmost_mouse_over_target.get() == prev_mouse_over_target { @@ -3650,15 +3652,17 @@ impl ScriptThread { Some(document) => document, None => return warn!("Message sent to closed pipeline {}.", pipeline_id), }; - document.handle_mouse_event( - self.js_runtime.rt(), - button, - point, - mouse_event_type, - node_address, - point_in_node, - pressed_mouse_buttons, - ); + unsafe { + document.handle_mouse_event( + self.js_runtime.rt(), + button, + point, + mouse_event_type, + node_address, + point_in_node, + pressed_mouse_buttons, + ) + } } fn handle_touch_event( @@ -3676,13 +3680,15 @@ impl ScriptThread { return TouchEventResult::Processed(true); }, }; - document.handle_touch_event( - self.js_runtime.rt(), - event_type, - identifier, - point, - node_address, - ) + unsafe { + document.handle_touch_event( + self.js_runtime.rt(), + event_type, + identifier, + point, + node_address, + ) + } } fn handle_wheel_event( @@ -3696,7 +3702,9 @@ impl ScriptThread { Some(document) => document, None => return warn!("Message sent to closed pipeline {}.", pipeline_id), }; - document.handle_wheel_event(self.js_runtime.rt(), wheel_delta, point, node_address); + unsafe { + document.handle_wheel_event(self.js_runtime.rt(), wheel_delta, point, node_address) + }; } /// Handle a "navigate an iframe" message from the constellation.