Move util::logical_geometry to style

20 files changed, 20 insertions, 21 deletions

diff --git a/components/layout/block.rs b/components/layout/block.rs
index c26cd450b74..05ffa1838f0 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -59,11 +59,11 @@ use std::sync::Arc;
 use style::computed_values::{border_collapse, box_sizing, display, float, overflow_x, overflow_y};
 use style::computed_values::{position, text_align, transform_style};
 use style::context::StyleContext;
+use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
 use style::properties::ComputedValues;
 use style::values::computed::{LengthOrNone, LengthOrPercentageOrNone};
 use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto};
 use util::geometry::MAX_RECT;
-use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
 use util::opts;
 use util::print_tree::PrintTree;
 
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 00f1d9e4d75..d49f4f4813b 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -46,6 +46,7 @@ use style::computed_values::{background_attachment, background_clip, background_
 use style::computed_values::{background_repeat, background_size};
 use style::computed_values::{border_style, image_rendering, overflow_x, position};
 use style::computed_values::{transform, transform_style, visibility};
+use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
 use style::properties::style_structs::Border;
 use style::properties::{self, ComputedValues};
 use style::values::RGBA;
@@ -56,7 +57,6 @@ use style::values::specified::{AngleOrCorner, HorizontalDirection, VerticalDirec
 use style_traits::cursor::Cursor;
 use table_cell::CollapsedBordersForCell;
 use url::Url;
-use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
 use util::opts;
 use util::range::Range;
 
diff --git a/components/layout/flex.rs b/components/layout/flex.rs
index 61151ddd6a9..cbb685d046e 100644
--- a/components/layout/flex.rs
+++ b/components/layout/flex.rs
@@ -27,10 +27,10 @@ use model::{IntrinsicISizes};
 use std::cmp::max;
 use std::sync::Arc;
 use style::computed_values::{flex_direction, float};
+use style::logical_geometry::LogicalSize;
 use style::properties::ComputedValues;
 use style::properties::style_structs;
 use style::values::computed::LengthOrPercentageOrAuto;
-use util::logical_geometry::LogicalSize;
 use util::opts;
 
 // A mode describes which logical axis a flex axis is parallel with.
diff --git a/components/layout/floats.rs b/components/layout/floats.rs
index 9385bd69afc..f74b063b2b8 100644
--- a/components/layout/floats.rs
+++ b/components/layout/floats.rs
@@ -7,8 +7,7 @@ use std::cmp::{max, min};
 use std::fmt;
 use std::i32;
 use style::computed_values::float;
-use util::logical_geometry::WritingMode;
-use util::logical_geometry::{LogicalRect, LogicalSize};
+use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
 use util::persistent_list::PersistentList;
 
 /// The kind of float: left or right.
diff --git a/components/layout/flow.rs b/components/layout/flow.rs
index d59d7f38123..b215856b967 100644
--- a/components/layout/flow.rs
+++ b/components/layout/flow.rs
@@ -48,6 +48,7 @@ use std::sync::atomic::Ordering;
 use std::{fmt, mem, raw};
 use style::computed_values::{clear, display, empty_cells, float, position, text_align};
 use style::dom::TRestyleDamage;
+use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
 use style::properties::{self, ComputedValues};
 use style::values::computed::LengthOrPercentageOrAuto;
 use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, TableFlow};
@@ -57,7 +58,6 @@ use table_colgroup::TableColGroupFlow;
 use table_row::TableRowFlow;
 use table_rowgroup::TableRowGroupFlow;
 use table_wrapper::TableWrapperFlow;
-use util::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
 use util::print_tree::PrintTree;
 use wrapper::{PseudoElementType, ThreadSafeLayoutNode};
 
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 015fa2f05e7..2c0fc922cb5 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -40,6 +40,7 @@ use style::computed_values::{border_collapse, clear, display, mix_blend_mode, ov
 use style::computed_values::{overflow_x, position, text_decoration, transform_style};
 use style::computed_values::{white_space, word_break, z_index};
 use style::dom::TRestyleDamage;
+use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode};
 use style::properties::ComputedValues;
 use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto};
 use style::values::computed::{LengthOrPercentageOrNone};
@@ -47,7 +48,6 @@ use text;
 use text::TextRunScanner;
 use url::Url;
 use util;
-use util::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode};
 use util::range::*;
 use util::str::slice_chars;
 use wrapper::{PseudoElementType, ThreadSafeLayoutElement, ThreadSafeLayoutNode};
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index d20fb2224a1..c95012a6f2a 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -27,12 +27,12 @@ use std::sync::Arc;
 use std::{fmt, isize, mem};
 use style::computed_values::{display, overflow_x, position, text_align, text_justify};
 use style::computed_values::{text_overflow, vertical_align, white_space};
+use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
 use style::properties::ComputedValues;
 use style::values::computed::LengthOrPercentage;
 use text;
 use unicode_bidi;
 use util;
-use util::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
 use util::print_tree::PrintTree;
 use util::range::{Range, RangeIndex};
 use wrapper::PseudoElementType;
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs
index a540039c51b..e5f72a395e4 100644
--- a/components/layout/layout_thread.rs
+++ b/components/layout/layout_thread.rs
@@ -65,6 +65,7 @@ use style::computed_values::{filter, mix_blend_mode};
 use style::context::{ReflowGoal, StylistWrapper};
 use style::dom::{TDocument, TElement, TNode};
 use style::error_reporting::ParseErrorReporter;
+use style::logical_geometry::LogicalPoint;
 use style::media_queries::{Device, MediaType};
 use style::parallel::WorkQueueData;
 use style::selector_impl::ServoSelectorImpl;
@@ -75,7 +76,6 @@ use traversal::RecalcStyleAndConstructFlows;
 use url::Url;
 use util::geometry::MAX_RECT;
 use util::ipc::OptionalIpcSender;
-use util::logical_geometry::LogicalPoint;
 use util::opts;
 use util::thread;
 use util::thread_state;
diff --git a/components/layout/list_item.rs b/components/layout/list_item.rs
index 95978c6c7ae..8caf8dfdd77 100644
--- a/components/layout/list_item.rs
+++ b/components/layout/list_item.rs
@@ -22,9 +22,9 @@ use incremental::RESOLVE_GENERATED_CONTENT;
 use inline::InlineMetrics;
 use std::sync::Arc;
 use style::computed_values::{list_style_type, position};
+use style::logical_geometry::LogicalSize;
 use style::properties::ComputedValues;
 use text;
-use util::logical_geometry::LogicalSize;
 use util::opts;
 
 /// A block with the CSS `display` property equal to `list-item`.
diff --git a/components/layout/model.rs b/components/layout/model.rs
index b32a9c48bf9..057bb46fa52 100644
--- a/components/layout/model.rs
+++ b/components/layout/model.rs
@@ -12,10 +12,10 @@ use fragment::Fragment;
 use std::cmp::{max, min};
 use std::fmt;
 use style::computed_values::transform::ComputedMatrix;
+use style::logical_geometry::LogicalMargin;
 use style::properties::ComputedValues;
 use style::values::computed::{BorderRadiusSize, LengthOrPercentageOrAuto};
 use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrNone};
-use util::logical_geometry::LogicalMargin;
 
 /// A collapsible margin. See CSS 2.1 § 8.3.1.
 #[derive(Copy, Clone)]
diff --git a/components/layout/multicol.rs b/components/layout/multicol.rs
index 93ecbe26c29..1485ade4aeb 100644
--- a/components/layout/multicol.rs
+++ b/components/layout/multicol.rs
@@ -18,9 +18,9 @@ use std::cmp::{min, max};
 use std::fmt;
 use std::sync::Arc;
 use style::context::StyleContext;
+use style::logical_geometry::LogicalSize;
 use style::properties::ComputedValues;
 use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
-use util::logical_geometry::LogicalSize;
 use util::print_tree::PrintTree;
 
 pub struct MulticolFlow {
diff --git a/components/layout/query.rs b/components/layout/query.rs
index 5258c56ec8f..af2dbdd9724 100644
--- a/components/layout/query.rs
+++ b/components/layout/query.rs
@@ -24,12 +24,12 @@ use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 use string_cache::Atom;
 use style::computed_values;
+use style::logical_geometry::WritingMode;
 use style::properties::longhands::{display, position};
 use style::properties::style_structs;
 use style::selector_impl::PseudoElement;
 use style::values::AuExtensionMethods;
 use style_traits::cursor::Cursor;
-use util::logical_geometry::WritingMode;
 use wrapper::{LayoutNode, ThreadSafeLayoutNode};
 
 pub struct LayoutRPCImpl(pub Arc<Mutex<LayoutThreadData>>);
diff --git a/components/layout/table.rs b/components/layout/table.rs
index e8a8998b14d..07b606733e8 100644
--- a/components/layout/table.rs
+++ b/components/layout/table.rs
@@ -23,13 +23,13 @@ use std::cmp;
 use std::fmt;
 use std::sync::Arc;
 use style::computed_values::{border_collapse, border_spacing, table_layout};
+use style::logical_geometry::LogicalSize;
 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::logical_geometry::LogicalSize;
 use util::print_tree::PrintTree;
 
 /// A table flow corresponded to the table's internal table fragment under a table wrapper flow.
diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs
index 1b764360201..5c01132ccd6 100644
--- a/components/layout/table_caption.rs
+++ b/components/layout/table_caption.rs
@@ -14,8 +14,8 @@ use flow::{Flow, FlowClass, OpaqueFlow};
 use fragment::{Fragment, FragmentBorderBoxIterator, Overflow};
 use std::fmt;
 use std::sync::Arc;
+use style::logical_geometry::LogicalSize;
 use style::properties::ComputedValues;
-use util::logical_geometry::LogicalSize;
 use util::print_tree::PrintTree;
 
 /// A table formatting context.
diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs
index 51d15187fd7..d1c33654bbc 100644
--- a/components/layout/table_cell.rs
+++ b/components/layout/table_cell.rs
@@ -20,10 +20,10 @@ use model::MaybeAuto;
 use std::fmt;
 use std::sync::Arc;
 use style::computed_values::{border_collapse, border_top_style};
+use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode};
 use style::properties::ComputedValues;
 use table::InternalTable;
 use table_row::{CollapsedBorder, CollapsedBorderProvenance};
-use util::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode};
 use util::print_tree::PrintTree;
 use wrapper::{ThreadSafeLayoutNode};
 
diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs
index bcee65b2564..f62ceb53592 100644
--- a/components/layout/table_colgroup.rs
+++ b/components/layout/table_colgroup.rs
@@ -15,9 +15,9 @@ use layout_debug;
 use std::cmp::max;
 use std::fmt;
 use std::sync::Arc;
+use style::logical_geometry::LogicalSize;
 use style::properties::ComputedValues;
 use style::values::computed::LengthOrPercentageOrAuto;
-use util::logical_geometry::LogicalSize;
 
 /// A table formatting context.
 pub struct TableColGroupFlow {
diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs
index 13dc123958e..ceeed531a8e 100644
--- a/components/layout/table_row.rs
+++ b/components/layout/table_row.rs
@@ -24,11 +24,11 @@ use std::fmt;
 use std::iter::{Enumerate, IntoIterator, Peekable};
 use std::sync::Arc;
 use style::computed_values::{border_collapse, border_spacing, border_top_style};
+use style::logical_geometry::{LogicalSize, PhysicalSide, WritingMode};
 use style::properties::ComputedValues;
 use style::values::computed::LengthOrPercentageOrAuto;
 use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, VecExt};
 use table_cell::{CollapsedBordersForCell, TableCellFlow};
-use util::logical_geometry::{LogicalSize, PhysicalSide, WritingMode};
 use util::print_tree::PrintTree;
 
 /// A single row of a table.
diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs
index 9a9e9b59eb0..6679b01fe2f 100644
--- a/components/layout/table_rowgroup.rs
+++ b/components/layout/table_rowgroup.rs
@@ -18,10 +18,10 @@ use std::fmt;
 use std::iter::{IntoIterator, Iterator, Peekable};
 use std::sync::Arc;
 use style::computed_values::{border_collapse, border_spacing};
+use style::logical_geometry::{LogicalSize, WritingMode};
 use style::properties::ComputedValues;
 use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, TableLikeFlow};
 use table_row::{self, CollapsedBordersForRow};
-use util::logical_geometry::{LogicalSize, WritingMode};
 use util::print_tree::PrintTree;
 
 /// A table formatting context.
diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs
index a6ab4a2c282..d8cc8d01aa3 100644
--- a/components/layout/table_wrapper.rs
+++ b/components/layout/table_wrapper.rs
@@ -28,12 +28,12 @@ use std::fmt;
 use std::ops::Add;
 use std::sync::Arc;
 use style::computed_values::{border_collapse, table_layout};
+use style::logical_geometry::LogicalSize;
 use style::properties::ComputedValues;
 use style::values::CSSFloat;
 use style::values::computed::LengthOrPercentageOrAuto;
 use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize};
 use table_row;
-use util::logical_geometry::LogicalSize;
 use util::print_tree::PrintTree;
 
 #[derive(Copy, Clone, RustcEncodable, Debug)]
diff --git a/components/layout/text.rs b/components/layout/text.rs
index 427f16fce31..3a0506d05b3 100644
--- a/components/layout/text.rs
+++ b/components/layout/text.rs
@@ -21,12 +21,12 @@ use std::mem;
 use std::sync::Arc;
 use style::computed_values::{line_height, text_orientation, text_rendering, text_transform};
 use style::computed_values::{white_space};
+use style::logical_geometry::{LogicalSize, WritingMode};
 use style::properties::ComputedValues;
 use style::properties::style_structs::Font as FontStyle;
 use unicode_bidi::{is_rtl, process_text};
 use unicode_script::{get_script, Script};
 use util::linked_list::split_off_head;
-use util::logical_geometry::{LogicalSize, WritingMode};
 use util::range::{Range, RangeIndex};
 
 /// Returns the concatenated text of a list of unscanned text fragments.