diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-07 16:31:10 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-07 16:31:10 -0600 |
commit | d8ac5100e81ccbad4b5131688b96bedb9b5e279d (patch) | |
tree | 50e4518ec7459d74feeb6b4ea15f453238af31f1 /components/layout/table.rs | |
parent | f1c3e97fb47b6fbe1d82ebb30a38ab7afd4fe0b8 (diff) | |
parent | a2c7a9d0fb7174f9188640ba2fb5a3df7821c1a8 (diff) | |
download | servo-d8ac5100e81ccbad4b5131688b96bedb9b5e279d.tar.gz servo-d8ac5100e81ccbad4b5131688b96bedb9b5e279d.zip |
Auto merge of #14034 - bholley:more_concrete_types, r=emilio
incremental restyle: Use more concrete types in the style system
We need to hang both snapshots and restyle damage off of ElementData, and so we need them to be concrete to avoid infecting ElementData with the trait hierarchy.
<!-- 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/14034)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/table.rs')
-rw-r--r-- | components/layout/table.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/table.rs b/components/layout/table.rs index 3ffc5231f5a..b1f3a01fc22 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -21,7 +21,6 @@ use gfx_traits::ScrollRootId; use gfx_traits::print_tree::PrintTree; use layout_debug; use model::{IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto}; -use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use std::cmp; use std::fmt; use std::sync::Arc; @@ -29,6 +28,7 @@ use style::computed_values::{border_collapse, border_spacing, table_layout}; use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; +use style::servo::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use style::values::CSSFloat; use style::values::computed::LengthOrPercentageOrAuto; use table_row::{self, CellIntrinsicInlineSize, CollapsedBorder, CollapsedBorderProvenance}; |