diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-09-19 13:34:51 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-09-19 13:34:51 -0600 |
commit | a0d3c9223f09757124b1520c4f17e94fa8bbe249 (patch) | |
tree | 1dd3e40e5a554466dfb4575758ad15967927d44d /components/layout/table.rs | |
parent | 7f2d81933a6158926ff6d03acbc05f191cd5adb3 (diff) | |
parent | de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (diff) | |
download | servo-a0d3c9223f09757124b1520c4f17e94fa8bbe249.tar.gz servo-a0d3c9223f09757124b1520c4f17e94fa8bbe249.zip |
Auto merge of #7662 - nerith:import, r=frewsxcv
Check for multiple import blocks separated by whitespace
Fixes #7381.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7662)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/table.rs')
-rw-r--r-- | components/layout/table.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/components/layout/table.rs b/components/layout/table.rs index b214e6d3ddc..eabe20f335f 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -10,18 +10,14 @@ use block::{ISizeConstraintInput, ISizeConstraintSolution}; use block::{self, BlockFlow, CandidateBSizeIterator, ISizeAndMarginsComputer}; use context::LayoutContext; use display_list_builder::{BlockFlowDisplayListBuilding, BorderPaintingMode}; +use euclid::{Point2D, Rect}; use flow::{IMPACTED_BY_RIGHT_FLOATS, ImmutableFlowUtils, MutableFlowUtils, OpaqueFlow}; use flow::{self, EarlyAbsolutePositionInfo, Flow, FlowClass, IMPACTED_BY_LEFT_FLOATS}; use fragment::{Fragment, FragmentBorderBoxIterator}; +use gfx::display_list::DisplayList; use incremental::{REFLOW, REFLOW_OUT_OF_FLOW}; use layout_debug; use model::{IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto}; -use table_row::{TableRowFlow}; -use table_row::{self, CellIntrinsicInlineSize, CollapsedBorder, CollapsedBorderProvenance}; -use table_wrapper::TableLayout; - -use euclid::{Point2D, Rect}; -use gfx::display_list::DisplayList; use std::cmp; use std::fmt; use std::sync::Arc; @@ -29,6 +25,9 @@ use style::computed_values::{border_collapse, border_spacing, table_layout}; use style::properties::ComputedValues; use style::values::CSSFloat; use style::values::computed::LengthOrPercentageOrAuto; +use table_row::{TableRowFlow}; +use table_row::{self, CellIntrinsicInlineSize, CollapsedBorder, CollapsedBorderProvenance}; +use table_wrapper::TableLayout; use util::geometry::Au; use util::logical_geometry::LogicalSize; |