aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/document.rs14
-rw-r--r--components/script/dom/documentorshadowroot.rs8
-rw-r--r--components/script/dom/node.rs3
-rw-r--r--components/script/dom/window.rs8
4 files changed, 10 insertions, 23 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 5dec5ff75f9..b2965c8832e 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -122,7 +122,7 @@ use euclid::default::{Point2D, Rect, Size2D};
use html5ever::{LocalName, Namespace, QualName};
use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcSender};
-use js::jsapi::{JSObject, JSRuntime};
+use js::jsapi::{JSObject};
use keyboard_types::{Code, Key, KeyState};
use metrics::{
InteractiveFlag, InteractiveMetrics, InteractiveWindow, ProfilerMetadataFactory,
@@ -1187,7 +1187,6 @@ impl Document {
#[allow(unsafe_code)]
pub unsafe fn handle_mouse_event(
&self,
- js_runtime: *mut JSRuntime,
button: MouseButton,
client_point: Point2D<f32>,
mouse_event_type: MouseEventType,
@@ -1203,7 +1202,7 @@ impl Document {
debug!("{}: at {:?}", mouse_event_type_string, client_point);
let el = node_address.and_then(|address| {
- let node = node::from_untrusted_node_address(js_runtime, address);
+ let node = node::from_untrusted_node_address(address);
node.inclusive_ancestors(ShadowIncluding::No)
.filter_map(DomRoot::downcast::<Element>)
.next()
@@ -1391,14 +1390,13 @@ impl Document {
#[allow(unsafe_code)]
pub unsafe fn handle_mouse_move_event(
&self,
- js_runtime: *mut JSRuntime,
client_point: Point2D<f32>,
prev_mouse_over_target: &MutNullableDom<Element>,
node_address: Option<UntrustedNodeAddress>,
pressed_mouse_buttons: u16,
) {
let maybe_new_target = node_address.and_then(|address| {
- let node = node::from_untrusted_node_address(js_runtime, address);
+ let node = node::from_untrusted_node_address(address);
node.inclusive_ancestors(ShadowIncluding::No)
.filter_map(DomRoot::downcast::<Element>)
.next()
@@ -1564,7 +1562,6 @@ impl Document {
#[allow(unsafe_code)]
pub unsafe fn handle_wheel_event(
&self,
- js_runtime: *mut JSRuntime,
delta: WheelDelta,
client_point: Point2D<f32>,
node_address: Option<UntrustedNodeAddress>,
@@ -1573,7 +1570,7 @@ impl Document {
debug!("{}: at {:?}", wheel_event_type_string, client_point);
let el = node_address.and_then(|address| {
- let node = node::from_untrusted_node_address(js_runtime, address);
+ let node = node::from_untrusted_node_address(address);
node.inclusive_ancestors(ShadowIncluding::No)
.filter_map(DomRoot::downcast::<Element>)
.next()
@@ -1611,7 +1608,6 @@ impl Document {
#[allow(unsafe_code)]
pub unsafe fn handle_touch_event(
&self,
- js_runtime: *mut JSRuntime,
event_type: TouchEventType,
touch_id: TouchId,
point: Point2D<f32>,
@@ -1627,7 +1623,7 @@ impl Document {
};
let el = node_address.and_then(|address| {
- let node = node::from_untrusted_node_address(js_runtime, address);
+ let node = node::from_untrusted_node_address(address);
node.inclusive_ancestors(ShadowIncluding::No)
.filter_map(DomRoot::downcast::<Element>)
.next()
diff --git a/components/script/dom/documentorshadowroot.rs b/components/script/dom/documentorshadowroot.rs
index 5469287d87c..87322db2574 100644
--- a/components/script/dom/documentorshadowroot.rs
+++ b/components/script/dom/documentorshadowroot.rs
@@ -14,7 +14,6 @@ use crate::dom::node::{self, Node, VecPreOrderInsertionHelper};
use crate::dom::window::Window;
use crate::stylesheet_set::StylesheetSetRef;
use euclid::default::Point2D;
-use js::jsapi::JS_GetRuntime;
use script_layout_interface::message::{NodesFromPointQueryType, QueryMsg};
use script_traits::UntrustedNodeAddress;
use servo_arc::Arc;
@@ -131,8 +130,7 @@ impl DocumentOrShadowRoot {
.first()
{
Some(address) => {
- let js_runtime = unsafe { JS_GetRuntime(*self.window.get_cx()) };
- let node = unsafe { node::from_untrusted_node_address(js_runtime, *address) };
+ let node = unsafe { node::from_untrusted_node_address(*address) };
let parent_node = node.GetParentNode().unwrap();
let element_ref = node
.downcast::<Element>()
@@ -167,15 +165,13 @@ impl DocumentOrShadowRoot {
return vec![];
}
- let js_runtime = unsafe { JS_GetRuntime(*self.window.get_cx()) };
-
// Step 1 and Step 3
let nodes = self.nodes_from_point(point, NodesFromPointQueryType::All);
let mut elements: Vec<DomRoot<Element>> = nodes
.iter()
.flat_map(|&untrusted_node_address| {
let node = unsafe {
- node::from_untrusted_node_address(js_runtime, untrusted_node_address)
+ node::from_untrusted_node_address(untrusted_node_address)
};
DomRoot::downcast::<Element>(node)
})
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index e5ebc92e651..8382d4b4145 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -69,7 +69,7 @@ use devtools_traits::NodeInfo;
use dom_struct::dom_struct;
use euclid::default::{Point2D, Rect, Size2D, Vector2D};
use html5ever::{Namespace, Prefix, QualName};
-use js::jsapi::{JSObject, JSRuntime};
+use js::jsapi::{JSObject};
use libc::{self, c_void, uintptr_t};
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use msg::constellation_msg::{BrowsingContextId, PipelineId};
@@ -1322,7 +1322,6 @@ where
/// returns it.
#[allow(unsafe_code)]
pub unsafe fn from_untrusted_node_address(
- _runtime: *mut JSRuntime,
candidate: UntrustedNodeAddress,
) -> DomRoot<Node> {
// https://github.com/servo/servo/issues/6383
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 70734efb9bb..71ceb293664 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1755,9 +1755,7 @@ impl Window {
for image in complete.pending_images {
let id = image.id;
- let js_runtime = self.js_runtime.borrow();
- let js_runtime = js_runtime.as_ref().unwrap();
- let node = unsafe { from_untrusted_node_address(js_runtime.rt(), image.node) };
+ let node = unsafe { from_untrusted_node_address(image.node) };
if let PendingImageState::Unrequested(ref url) = image.state {
fetch_image_for_layout(url.clone(), &*node, id, self.image_cache.clone());
@@ -1988,10 +1986,8 @@ impl Window {
// FIXME(nox): Layout can reply with a garbage value which doesn't
// actually correspond to an element, that's unsound.
let response = self.layout_rpc.offset_parent();
- let js_runtime = self.js_runtime.borrow();
- let js_runtime = js_runtime.as_ref().unwrap();
let element = response.node_address.and_then(|parent_node_address| {
- let node = unsafe { from_untrusted_node_address(js_runtime.rt(), parent_node_address) };
+ let node = unsafe { from_untrusted_node_address(parent_node_address) };
DomRoot::downcast(node)
});
(element, response.rect)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 15:38:06 +0000