Rename util.rs -> layout_data.rs

components/layout/construct.rs

@@ -41,7 +41,7 @@ use table_rowgroup::TableRowGroupFlow;
 use table_row::TableRowFlow;
 use table_cell::TableCellFlow;
 use text::TextRunScanner;
-use util::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper};
+use layout_data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper};
 use opaque_node::OpaqueNodeMethods;
 use wrapper::{PostorderNodeMutTraversal, PseudoElementType, TLayoutNode, ThreadSafeLayoutNode};
 

components/layout/css/matching.rs

@@ -8,7 +8,7 @@
 
 use css::node_style::StyledNode;
 use incremental::{self, RestyleDamage};
-use util::{LayoutDataAccess, LayoutDataWrapper};
+use layout_data::{LayoutDataAccess, LayoutDataWrapper};
 use wrapper::{LayoutElement, LayoutNode, TLayoutNode};
 
 use script::dom::node::NodeTypeId;

components/layout/layout_task.rs

@@ -18,7 +18,7 @@ use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAI
 use layout_debug;
 use parallel::{self, UnsafeFlow};
 use sequential;
-use util::{LayoutDataAccess, LayoutDataWrapper};
+use layout_data::{LayoutDataAccess, LayoutDataWrapper};
 use opaque_node::OpaqueNodeMethods;
 use wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode};
 

components/layout/lib.rs

@@ -68,6 +68,7 @@ pub mod flow_ref;
 pub mod fragment;
 pub mod layout_task;
 pub mod inline;
+pub mod layout_data;
 pub mod list_item;
 pub mod model;
 pub mod opaque_node;
@@ -82,7 +83,6 @@ pub mod table_row;
 pub mod table_cell;
 pub mod text;
 pub mod traversal;
-pub mod util;
 pub mod incremental;
 pub mod wrapper;
 

components/layout/parallel.rs

@@ -12,10 +12,10 @@ use context::{LayoutContext, SharedLayoutContextWrapper, SharedLayoutContext};
 use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal};
 use flow;
 use flow_ref::FlowRef;
-use traversal::{RecalcStyleForNode, ConstructFlows};
+use layout_data::{LayoutDataAccess, LayoutDataWrapper};
 use traversal::{BubbleISizes, AssignISizes, AssignBSizesAndStoreOverflow};
 use traversal::{ComputeAbsolutePositions, BuildDisplayList};
-use util::{LayoutDataAccess, LayoutDataWrapper};
+use traversal::{RecalcStyleForNode, ConstructFlows};
 use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_node, LayoutNode};
 use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode};
 use wrapper::{PreorderDomTraversal, PostorderDomTraversal};

components/layout/wrapper.rs

@@ -36,8 +36,8 @@ use canvas::canvas_paint_task::CanvasMsg;
 use context::SharedLayoutContext;
 use css::node_style::StyledNode;
 use incremental::RestyleDamage;
-use util::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper};
-use util::{PrivateLayoutData};
+use layout_data::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper};
+use layout_data::{PrivateLayoutData};
 use opaque_node::OpaqueNodeMethods;
 
 use cssparser::RGBA;