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

Simplify ThreadSafeLayoutNode::text_content.

Browse source
This commit is contained in:
Ms2ger 2015-06-24 15:43:10 +02:00
parent e02e7c517c
commit c87c7f1d84
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/layout/wrapper.rs
View file

@ -575,13 +575,6 @@ impl<'le> TElementAttributes for LayoutElement<'le> {
}
}
fn get_content(content_list: &content::T) -> Vec<ContentItem> {
match *content_list {
content::T::Content(ref value) if !value.is_empty() => (*value).clone(),
_ => vec![],
}
}
#[derive(Copy, PartialEq, Clone)]
pub enum PseudoElementType {
Normal,
@ -927,15 +920,17 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
pub fn text_content(&self) -> Vec<ContentItem> {
if self.pseudo != PseudoElementType::Normal {
let layout_data_ref = self.borrow_layout_data();
let node_layout_data_wrapper = layout_data_ref.as_ref().unwrap();
let data = &layout_data_ref.as_ref().unwrap().data;
if self.pseudo.is_before() {
let before_style = node_layout_data_wrapper.data.before_style.as_ref().unwrap();
return get_content(&before_style.get_box().content)
let style = if self.pseudo.is_before() {
&data.before_style
} else {
let after_style = node_layout_data_wrapper.data.after_style.as_ref().unwrap();
return get_content(&after_style.get_box().content)
}
&data.after_style
};
return match style.as_ref().unwrap().get_box().content {
content::T::Content(ref value) if !value.is_empty() => (*value).clone(),
_ => vec![],
};
}
let this = unsafe { self.get_jsmanaged() };