From 3441b2c329176fbb3e63b564c6eaef40862be38a Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Tue, 3 Mar 2015 19:59:38 +0000 Subject: [PATCH] layout/layout_data.rs -> layout/data.rs --- components/layout/construct.rs | 2 +- components/layout/css/matching.rs | 2 +- components/layout/{layout_data.rs => data.rs} | 0 components/layout/layout_task.rs | 2 +- components/layout/lib.rs | 2 +- components/layout/parallel.rs | 2 +- components/layout/wrapper.rs | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename components/layout/{layout_data.rs => data.rs} (100%) diff --git a/components/layout/construct.rs b/components/layout/construct.rs index dc128e216fd..7b6f4c63ebe 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -31,7 +31,7 @@ use fragment::{Fragment, IframeFragmentInfo}; use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo}; use incremental::{RECONSTRUCT_FLOW, RestyleDamage}; use inline::InlineFlow; -use layout_data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper}; +use data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper}; use list_item::{self, ListItemFlow}; use opaque_node::OpaqueNodeMethods; use parallel; diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs index 0b48c15b042..bec5a442387 100644 --- a/components/layout/css/matching.rs +++ b/components/layout/css/matching.rs @@ -8,7 +8,7 @@ use css::node_style::StyledNode; use incremental::{self, RestyleDamage}; -use layout_data::{LayoutDataAccess, LayoutDataWrapper}; +use data::{LayoutDataAccess, LayoutDataWrapper}; use wrapper::{LayoutElement, LayoutNode, TLayoutNode}; use script::dom::node::NodeTypeId; diff --git a/components/layout/layout_data.rs b/components/layout/data.rs similarity index 100% rename from components/layout/layout_data.rs rename to components/layout/data.rs diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index d700028465c..046d79b1805 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -15,7 +15,7 @@ use flow::{self, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUti use flow_ref::FlowRef; use fragment::{Fragment, FragmentBorderBoxIterator}; use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAINT}; -use layout_data::{LayoutDataAccess, LayoutDataWrapper}; +use data::{LayoutDataAccess, LayoutDataWrapper}; use layout_debug; use opaque_node::OpaqueNodeMethods; use parallel::{self, UnsafeFlow}; diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 626cd6cfe74..eb6bbff2ca3 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -60,6 +60,7 @@ pub mod layout_debug; pub mod block; pub mod construct; pub mod context; +pub mod data; pub mod display_list_builder; pub mod floats; pub mod flow; @@ -68,7 +69,6 @@ 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; diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 7a62bdcd661..015ed2d08d5 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -12,7 +12,7 @@ use context::{LayoutContext, SharedLayoutContextWrapper, SharedLayoutContext}; use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal}; use flow; use flow_ref::FlowRef; -use layout_data::{LayoutDataAccess, LayoutDataWrapper}; +use data::{LayoutDataAccess, LayoutDataWrapper}; use traversal::{BubbleISizes, AssignISizes, AssignBSizesAndStoreOverflow}; use traversal::{ComputeAbsolutePositions, BuildDisplayList}; use traversal::{RecalcStyleForNode, ConstructFlows}; diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index bfedc76e229..2a2e00ac9ef 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -36,7 +36,7 @@ use canvas::canvas_paint_task::CanvasMsg; use context::SharedLayoutContext; use css::node_style::StyledNode; use incremental::RestyleDamage; -use layout_data::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper, PrivateLayoutData}; +use data::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper, PrivateLayoutData}; use opaque_node::OpaqueNodeMethods; use cssparser::RGBA;