Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fmt

Browse source
This commit is contained in:
teymour-aldridge 2021-02-05 14:46:09 +00:00
parent ff767b13a9
commit 217147b2e4
4 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/document.rs
View file

@ -122,7 +122,7 @@ use euclid::default::{Point2D, Rect, Size2D};
use html5ever::{LocalName, Namespace, QualName}; use html5ever::{LocalName, Namespace, QualName};
use hyper_serde::Serde; use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::ipc::{self, IpcSender};
use js::jsapi::{JSObject}; use js::jsapi::JSObject;
use keyboard_types::{Code, Key, KeyState}; use keyboard_types::{Code, Key, KeyState};
use metrics::{ use metrics::{
InteractiveFlag, InteractiveMetrics, InteractiveWindow, ProfilerMetadataFactory, InteractiveFlag, InteractiveMetrics, InteractiveWindow, ProfilerMetadataFactory,

4
components/script/dom/documentorshadowroot.rs
View file

@ -170,9 +170,7 @@ impl DocumentOrShadowRoot {
let mut elements: Vec<DomRoot<Element>> = nodes let mut elements: Vec<DomRoot<Element>> = nodes
.iter() .iter()
.flat_map(|&untrusted_node_address| { .flat_map(|&untrusted_node_address| {
let node = unsafe { let node = unsafe { node::from_untrusted_node_address(untrusted_node_address) };
node::from_untrusted_node_address(untrusted_node_address)
};
DomRoot::downcast::<Element>(node) DomRoot::downcast::<Element>(node)
}) })
.collect(); .collect();

6
components/script/dom/node.rs
View file

@ -69,7 +69,7 @@ use devtools_traits::NodeInfo;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use euclid::default::{Point2D, Rect, Size2D, Vector2D}; use euclid::default::{Point2D, Rect, Size2D, Vector2D};
use html5ever::{Namespace, Prefix, QualName}; use html5ever::{Namespace, Prefix, QualName};
use js::jsapi::{JSObject}; use js::jsapi::JSObject;
use libc::{self, c_void, uintptr_t}; use libc::{self, c_void, uintptr_t};
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use msg::constellation_msg::{BrowsingContextId, PipelineId}; use msg::constellation_msg::{BrowsingContextId, PipelineId};
@ -1321,9 +1321,7 @@ where
/// If the given untrusted node address represents a valid DOM node in the given runtime, /// If the given untrusted node address represents a valid DOM node in the given runtime,
/// returns it. /// returns it.
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub unsafe fn from_untrusted_node_address( pub unsafe fn from_untrusted_node_address(candidate: UntrustedNodeAddress) -> DomRoot<Node> {
candidate: UntrustedNodeAddress,
) -> DomRoot<Node> {
// https://github.com/servo/servo/issues/6383 // https://github.com/servo/servo/issues/6383
let candidate: uintptr_t = mem::transmute(candidate.0); let candidate: uintptr_t = mem::transmute(candidate.0);
// let object: *mut JSObject = jsfriendapi::bindgen::JS_GetAddressableObject(runtime, // let object: *mut JSObject = jsfriendapi::bindgen::JS_GetAddressableObject(runtime,

13
components/script/script_thread.rs
View file

@ -3678,14 +3678,7 @@ impl ScriptThread {
return TouchEventResult::Processed(true); return TouchEventResult::Processed(true);
}, },
}; };
unsafe { unsafe { document.handle_touch_event(event_type, identifier, point, node_address) }
document.handle_touch_event(
event_type,
identifier,
point,
node_address,
)
}
} }
fn handle_wheel_event( fn handle_wheel_event(
@ -3699,9 +3692,7 @@ impl ScriptThread {
Some(document) => document, Some(document) => document,
None => return warn!("Message sent to closed pipeline {}.", pipeline_id), None => return warn!("Message sent to closed pipeline {}.", pipeline_id),
}; };
unsafe { unsafe { document.handle_wheel_event(wheel_delta, point, node_address) };
document.handle_wheel_event(wheel_delta, point, node_address)
};
} }
/// Handle a "navigate an iframe" message from the constellation. /// Handle a "navigate an iframe" message from the constellation.