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

Replace get_{before,after}_display by get_{before,after}_pseudo.

Browse source
This commit is contained in:
Ms2ger 2015-07-18 12:17:21 +02:00
parent 2e6a723970
commit 093204a224
1 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/layout/wrapper.rs
View file

@ -683,20 +683,20 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
} }
#[inline] #[inline]
pub fn get_before_display(&self) -> Option<display::T> { pub fn get_before_pseudo(&self) -> Option<ThreadSafeLayoutNode<'ln>> {
let mut layout_data_ref = self.mutate_layout_data(); let mut layout_data_ref = self.mutate_layout_data();
let node_layout_data_wrapper = layout_data_ref.as_mut().unwrap(); let node_layout_data_wrapper = layout_data_ref.as_mut().unwrap();
node_layout_data_wrapper.data.before_style.as_ref().map(|style| { node_layout_data_wrapper.data.before_style.as_ref().map(|style| {
style.get_box().display self.with_pseudo(PseudoElementType::Before(style.get_box().display))
}) })
} }
#[inline] #[inline]
pub fn get_after_display(&self) -> Option<display::T> { pub fn get_after_pseudo(&self) -> Option<ThreadSafeLayoutNode<'ln>> {
let mut layout_data_ref = self.mutate_layout_data(); let mut layout_data_ref = self.mutate_layout_data();
let node_layout_data_wrapper = layout_data_ref.as_mut().unwrap(); let node_layout_data_wrapper = layout_data_ref.as_mut().unwrap();
node_layout_data_wrapper.data.after_style.as_ref().map(|style| { node_layout_data_wrapper.data.after_style.as_ref().map(|style| {
style.get_box().display self.with_pseudo(PseudoElementType::After(style.get_box().display))
}) })
} }
@ -932,9 +932,7 @@ impl<'a> ThreadSafeLayoutNodeChildrenIterator<'a> {
return None return None
} }
parent.get_before_display().map(|display| { parent.get_before_pseudo().or_else(|| {
parent.with_pseudo(PseudoElementType::Before(display))
}).or_else(|| {
unsafe { unsafe {
parent.get_jsmanaged().first_child_ref() parent.get_jsmanaged().first_child_ref()
.map(|node| parent.new_with_this_lifetime(&node)) .map(|node| parent.new_with_this_lifetime(&node))
@ -963,12 +961,7 @@ impl<'a> Iterator for ThreadSafeLayoutNodeChildrenIterator<'a> {
self.parent_node.new_with_this_lifetime(&first) self.parent_node.new_with_this_lifetime(&first)
}) })
}, },
None => { None => self.parent_node.get_after_pseudo(),
self.parent_node.get_after_display().map(|display| {
self.parent_node.with_pseudo(
PseudoElementType::After(display))
})
}
} }
}, },
PseudoElementType::Normal => { PseudoElementType::Normal => {
@ -978,12 +971,7 @@ impl<'a> Iterator for ThreadSafeLayoutNodeChildrenIterator<'a> {
self.parent_node.new_with_this_lifetime(&next) self.parent_node.new_with_this_lifetime(&next)
}) })
}, },
None => { None => self.parent_node.get_after_pseudo(),
self.parent_node.get_after_display().map(|display| {
self.parent_node.with_pseudo(
PseudoElementType::After(display))
})
},
} }
}, },
PseudoElementType::After(_) => { PseudoElementType::After(_) => {