diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-10 10:34:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 10:34:57 -0800 |
| commit | 0dd4afcf6dd3efb8e9f6e620e8e0dc7b135f8eee (patch) | |
| tree | 810e601efe0cea68484d3545b9e5f52ebf21b383 /components/script/layout_wrapper.rs | |
| parent | 401a55e172e7ebdbc1045400ec4720a6c3f1cb03 (diff) | |
| parent | 1f4f099efe89aacf9d1b520f41644832d560360e (diff) | |
| download | servo-0dd4afcf6dd3efb8e9f6e620e8e0dc7b135f8eee.tar.gz servo-0dd4afcf6dd3efb8e9f6e620e8e0dc7b135f8eee.zip | |
Auto merge of #15480 - bholley:refactor_style_computation, r=emilio
Refactor style computation
See https://bugzilla.mozilla.org/show_bug.cgi?id=1338382
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15480)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_wrapper.rs')
| -rw-r--r-- | components/script/layout_wrapper.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index a5baec25745..000a844bc16 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -393,10 +393,10 @@ impl<'le> TElement for ServoLayoutElement<'le> { #[inline] fn existing_style_for_restyle_damage<'a>(&'a self, - current_cv: Option<&'a Arc<ComputedValues>>, + current_cv: &'a Arc<ComputedValues>, _pseudo_element: Option<&PseudoElement>) -> Option<&'a Arc<ComputedValues>> { - current_cv + Some(current_cv) } fn has_dirty_descendants(&self) -> bool { @@ -777,7 +777,7 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> { debug_assert!(self.is_text_node()); let parent = self.node.parent_node().unwrap().as_element().unwrap(); let parent_data = parent.get_data().unwrap().borrow(); - parent_data.styles().primary.values.clone() + parent_data.styles().primary.values().clone() } fn debug_id(self) -> usize { |