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

Introduce ThreadSafeLayoutNode::borrow_layout_data_unchecked.

Browse source
This commit is contained in:
Ms2ger 2016-06-15 08:54:08 +01:00
parent 1039de8e7d
commit dac8878467
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/wrapper.rs
View file

@ -796,6 +796,9 @@ pub trait ThreadSafeLayoutNode: Clone + Copy + Sized + PartialEq {
fn get_style_and_layout_data(&self) -> Option<OpaqueStyleAndLayoutData>; fn get_style_and_layout_data(&self) -> Option<OpaqueStyleAndLayoutData>;
#[inline(always)]
unsafe fn borrow_layout_data_unchecked(&self) -> Option<*const PrivateLayoutData>;
/// Borrows the layout data immutably. Fails on a conflicting borrow. /// Borrows the layout data immutably. Fails on a conflicting borrow.
/// ///
/// TODO(pcwalton): Make this private. It will let us avoid borrow flag checks in some cases. /// TODO(pcwalton): Make this private. It will let us avoid borrow flag checks in some cases.
@ -1122,6 +1125,13 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
self.node.get_style_and_layout_data() self.node.get_style_and_layout_data()
} }
unsafe fn borrow_layout_data_unchecked(&self) -> Option<*const PrivateLayoutData> {
self.get_style_and_layout_data().map(|opaque| {
let container = *opaque.ptr as NonOpaqueStyleAndLayoutData;
&(*(*container).as_unsafe_cell().get()) as *const PrivateLayoutData
})
}
fn borrow_layout_data(&self) -> Option<Ref<PrivateLayoutData>> { fn borrow_layout_data(&self) -> Option<Ref<PrivateLayoutData>> {
unsafe { unsafe {
self.get_style_and_layout_data().map(|opaque| { self.get_style_and_layout_data().map(|opaque| {
@ -1171,7 +1181,7 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
fn flags(self) -> LayoutDataFlags { fn flags(self) -> LayoutDataFlags {
unsafe { unsafe {
(*self.node.borrow_layout_data_unchecked().unwrap()).flags (*self.borrow_layout_data_unchecked().unwrap()).flags
} }
} }