diff options
Diffstat (limited to 'components/layout/construct.rs')
| -rw-r--r-- | components/layout/construct.rs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 239dc52e01c..b052d9e1176 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -360,6 +360,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> let fragment = Fragment::from_opaque_node_and_style(child_node.opaque(), PseudoElementType::Normal, style, + child_node.selected_style().clone(), child_node.restyle_damage(), SpecificFragmentInfo::TableRow); let mut new_child: FlowRef = Arc::new(TableRowFlow::from_fragment(fragment)); @@ -373,6 +374,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> let fragment = Fragment::from_opaque_node_and_style(child_node.opaque(), PseudoElementType::Normal, style, + child_node.selected_style().clone(), child_node.restyle_damage(), SpecificFragmentInfo::Table); let mut new_child: FlowRef = Arc::new(TableFlow::from_fragment(fragment)); @@ -387,6 +389,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> Fragment::from_opaque_node_and_style(child_node.opaque(), PseudoElementType::Normal, style, + child_node.selected_style().clone(), child_node.restyle_damage(), SpecificFragmentInfo::TableWrapper); let mut new_child: FlowRef = Arc::new(TableWrapperFlow::from_fragment(fragment, None)); @@ -583,6 +586,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> properties::modify_style_for_text(&mut whitespace_style); let fragment = Fragment::from_opaque_node_and_style(whitespace_node, whitespace_pseudo, + whitespace_style.clone(), whitespace_style, whitespace_damage, fragment_info); @@ -713,6 +717,8 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> let mut style = (*style).clone(); properties::modify_style_for_text(&mut style); + let selected_style = node.selected_style().clone(); + match text_content { TextContent::Text(string) => { let info = box UnscannedTextFragmentInfo::new(string, selection); @@ -720,7 +726,8 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> fragments.fragments.push_back(Fragment::from_opaque_node_and_style( node.opaque(), node.get_pseudo_element_type().strip(), - style.clone(), + style, + selected_style, node.restyle_damage(), specific_fragment_info)) } @@ -740,6 +747,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> node.opaque(), node.get_pseudo_element_type().strip(), style.clone(), + selected_style.clone(), node.restyle_damage(), specific_fragment_info)) } @@ -823,6 +831,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> let kid_node = flow.as_block().fragment.node; let kid_pseudo = flow.as_block().fragment.pseudo.clone(); let kid_style = flow.as_block().fragment.style.clone(); + let kid_selected_style = flow.as_block().fragment.selected_style.clone(); let kid_restyle_damage = flow.as_block().fragment.restyle_damage; let fragment_info = SpecificFragmentInfo::InlineAbsolute( InlineAbsoluteFragmentInfo::new(flow)); @@ -830,6 +839,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> kid_node, kid_pseudo, kid_style, + kid_selected_style, kid_restyle_damage, fragment_info)); fragment_accumulator.fragments @@ -864,6 +874,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> properties::modify_style_for_text(&mut whitespace_style); let fragment = Fragment::from_opaque_node_and_style(whitespace_node, whitespace_pseudo, + whitespace_style.clone(), whitespace_style, whitespace_damage, fragment_info); @@ -962,6 +973,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> let fragment = Fragment::from_opaque_node_and_style(node.opaque(), node.get_pseudo_element_type().strip(), modified_style.clone(), + node.selected_style().clone(), node.restyle_damage(), fragment_info); @@ -994,6 +1006,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> let fragment = Fragment::from_opaque_node_and_style(node.opaque(), PseudoElementType::Normal, style, + node.selected_style().clone(), node.restyle_damage(), fragment_info); @@ -1853,6 +1866,8 @@ fn control_chars_to_fragment(node: &InlineFragmentNodeInfo, properties::modify_style_for_text(&mut style); Fragment::from_opaque_node_and_style(node.address, node.pseudo, + style.clone(), + // TODO(emilio): Selected style? style, restyle_damage, info) |