diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-28 13:50:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-28 13:50:26 -0500 |
commit | e7b5891d9ccdb551a536937391c019e20b3911a4 (patch) | |
tree | fba134a86e0946499fc5d72a6228746941588ef5 /components/layout/fragment.rs | |
parent | af48de91fbc31a0bbb5c1fc5900fdb3e1519db5c (diff) | |
parent | 46e29184bd93861f660f18aa658de9318eab2f48 (diff) | |
download | servo-e7b5891d9ccdb551a536937391c019e20b3911a4.tar.gz servo-e7b5891d9ccdb551a536937391c019e20b3911a4.zip |
Auto merge of #13951 - bholley:more_element, r=emilio
incremental restyle: Hoist more stuff to Element
The patch here hoists pseudo-element handling onto ThreadSafeLayoutElement. I have another patch which hoists stuff from TNode to TElement, but want to make sure this patch passes try first.
<!-- 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/13951)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/fragment.rs')
-rw-r--r-- | components/layout/fragment.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index e79360d08f4..ab9563c90bc 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -885,7 +885,7 @@ pub struct TableColumnFragmentInfo { impl TableColumnFragmentInfo { /// Create the information specific to an table column fragment. pub fn new<N: ThreadSafeLayoutNode>(node: &N) -> TableColumnFragmentInfo { - let element = node.as_element(); + let element = node.as_element().unwrap(); let span = element.get_attr(&ns!(), &atom!("span")) .and_then(|string| string.parse().ok()) .unwrap_or(0); @@ -908,7 +908,7 @@ impl Fragment { Fragment { node: node.opaque(), style: style, - selected_style: node.selected_style(style_context), + selected_style: node.selected_style(), restyle_damage: restyle_damage, border_box: LogicalRect::zero(writing_mode), border_padding: LogicalMargin::zero(writing_mode), |