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

Introduce LayoutJS<Node>::opaque() to replace OpaqueNodeMethods::from_jsmanaged().

Browse source
This commit is contained in:
Ms2ger 2016-06-15 17:10:46 +01:00
parent 14a7e9bce1
commit 7de3d165ad
3 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout/opaque_node.rs
View file

@ -2,31 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![allow(unsafe_code)]
use gfx::display_list::OpaqueNode; use gfx::display_list::OpaqueNode;
use libc::{c_void, uintptr_t}; use libc::c_void;
use script::layout_interface::LayoutJS;
use script::layout_interface::Node;
use script_traits::UntrustedNodeAddress; use script_traits::UntrustedNodeAddress;
pub trait OpaqueNodeMethods { pub trait OpaqueNodeMethods {
/// Converts a DOM node to an `OpaqueNode'.
fn from_jsmanaged(node: &LayoutJS<Node>) -> Self;
/// Converts this node to an `UntrustedNodeAddress`. An `UntrustedNodeAddress` is just the type /// Converts this node to an `UntrustedNodeAddress`. An `UntrustedNodeAddress` is just the type
/// of node that script expects to receive in a hit test. /// of node that script expects to receive in a hit test.
fn to_untrusted_node_address(&self) -> UntrustedNodeAddress; fn to_untrusted_node_address(&self) -> UntrustedNodeAddress;
} }
impl OpaqueNodeMethods for OpaqueNode { impl OpaqueNodeMethods for OpaqueNode {
fn from_jsmanaged(node: &LayoutJS<Node>) -> OpaqueNode {
unsafe {
let ptr: uintptr_t = node.get_jsobject() as uintptr_t;
OpaqueNode(ptr)
}
}
fn to_untrusted_node_address(&self) -> UntrustedNodeAddress { fn to_untrusted_node_address(&self) -> UntrustedNodeAddress {
UntrustedNodeAddress(self.0 as *const c_void) UntrustedNodeAddress(self.0 as *const c_void)
} }

4
components/layout/wrapper.rs
View file

@ -156,7 +156,7 @@ impl<'ln> TNode for ServoLayoutNode<'ln> {
} }
fn opaque(&self) -> OpaqueNode { fn opaque(&self) -> OpaqueNode {
OpaqueNodeMethods::from_jsmanaged(unsafe { self.get_jsmanaged() }) unsafe { self.get_jsmanaged().opaque() }
} }
fn layout_parent_node(self, reflow_root: OpaqueNode) -> Option<ServoLayoutNode<'ln>> { fn layout_parent_node(self, reflow_root: OpaqueNode) -> Option<ServoLayoutNode<'ln>> {
@ -732,7 +732,7 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
} }
fn opaque(&self) -> OpaqueNode { fn opaque(&self) -> OpaqueNode {
OpaqueNodeMethods::from_jsmanaged(unsafe { self.get_jsmanaged() }) unsafe { self.get_jsmanaged().opaque() }
} }
fn type_id(&self) -> Option<LayoutNodeType> { fn type_id(&self) -> Option<LayoutNodeType> {

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

@ -75,6 +75,7 @@ use std::iter::{self, FilterMap, Peekable};
use std::mem; use std::mem;
use std::ops::Range; use std::ops::Range;
use string_cache::{Atom, Namespace, QualName}; use string_cache::{Atom, Namespace, QualName};
use style::dom::OpaqueNode;
use style::selector_impl::ServoSelectorImpl; use style::selector_impl::ServoSelectorImpl;
use url::Url; use url::Url;
use util::thread_state; use util::thread_state;
@ -961,6 +962,7 @@ pub trait LayoutNodeHelpers {
fn image_url(&self) -> Option<Url>; fn image_url(&self) -> Option<Url>;
fn canvas_data(&self) -> Option<HTMLCanvasData>; fn canvas_data(&self) -> Option<HTMLCanvasData>;
fn iframe_pipeline_id(&self) -> PipelineId; fn iframe_pipeline_id(&self) -> PipelineId;
fn opaque(&self) -> OpaqueNode;
} }
impl LayoutNodeHelpers for LayoutJS<Node> { impl LayoutNodeHelpers for LayoutJS<Node> {
@ -1101,6 +1103,13 @@ impl LayoutNodeHelpers for LayoutJS<Node> {
.expect("not an iframe element!"); .expect("not an iframe element!");
iframe_element.pipeline_id().unwrap() iframe_element.pipeline_id().unwrap()
} }
#[allow(unsafe_code)]
fn opaque(&self) -> OpaqueNode {
unsafe {
OpaqueNode(self.get_jsobject() as usize)
}
}
} }