From b424de2092b818c9ed76679ffcd6ecfa621e62ef Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Tue, 3 Mar 2015 17:49:10 +0000 Subject: Extract OpaqueNodeMethods to own file --- components/layout/construct.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components/layout/construct.rs') diff --git a/components/layout/construct.rs b/components/layout/construct.rs index b2ea8090ea6..5b691cef5cc 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -41,7 +41,8 @@ use table_rowgroup::TableRowGroupFlow; use table_row::TableRowFlow; use table_cell::TableCellFlow; use text::TextRunScanner; -use util::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, OpaqueNodeMethods, LayoutDataWrapper}; +use util::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper}; +use opaque_node::OpaqueNodeMethods; use wrapper::{PostorderNodeMutTraversal, PseudoElementType, TLayoutNode, ThreadSafeLayoutNode}; use gfx::display_list::OpaqueNode; -- cgit v1.2.3 From dd0df4e9c57bef2c2e1ceb7dc15c67e3a31ac10d Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Tue, 3 Mar 2015 18:12:06 +0000 Subject: Rename util.rs -> layout_data.rs --- components/layout/construct.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/layout/construct.rs') diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 5b691cef5cc..af8d151e101 100644 --- a/components/layout/construct.rs +++ b/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}; -- cgit v1.2.3 From 3f9032c1a19211f94ea20ce06eb29098486d1796 Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Tue, 3 Mar 2015 18:16:50 +0000 Subject: Re-alphabetise imports --- components/layout/construct.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'components/layout/construct.rs') diff --git a/components/layout/construct.rs b/components/layout/construct.rs index af8d151e101..dc128e216fd 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -13,36 +13,36 @@ #![deny(unsafe_blocks)] -use css::node_style::StyledNode; use block::BlockFlow; use context::LayoutContext; +use css::node_style::StyledNode; use floats::FloatKind; -use flow::{Flow, ImmutableFlowUtils, MutableOwnedFlowUtils}; use flow::{Descendants, AbsDescendants}; +use flow::{Flow, ImmutableFlowUtils, MutableOwnedFlowUtils}; use flow::{IS_ABSOLUTELY_POSITIONED}; use flow; use flow_ref::FlowRef; -use fragment::{Fragment, IframeFragmentInfo}; -use fragment::ImageFragmentInfo; use fragment::CanvasFragmentInfo; +use fragment::ImageFragmentInfo; use fragment::InlineAbsoluteHypotheticalFragmentInfo; -use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo}; use fragment::TableColumnFragmentInfo; use fragment::UnscannedTextFragmentInfo; +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 list_item::{self, ListItemFlow}; +use opaque_node::OpaqueNodeMethods; use parallel; -use table_wrapper::TableWrapperFlow; use table::TableFlow; use table_caption::TableCaptionFlow; +use table_cell::TableCellFlow; use table_colgroup::TableColGroupFlow; -use table_rowgroup::TableRowGroupFlow; use table_row::TableRowFlow; -use table_cell::TableCellFlow; +use table_rowgroup::TableRowGroupFlow; +use table_wrapper::TableWrapperFlow; use text::TextRunScanner; -use layout_data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper}; -use opaque_node::OpaqueNodeMethods; use wrapper::{PostorderNodeMutTraversal, PseudoElementType, TLayoutNode, ThreadSafeLayoutNode}; use gfx::display_list::OpaqueNode; -- cgit v1.2.3 From 3441b2c329176fbb3e63b564c6eaef40862be38a Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Tue, 3 Mar 2015 19:59:38 +0000 Subject: layout/layout_data.rs -> layout/data.rs --- components/layout/construct.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/layout/construct.rs') 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; -- cgit v1.2.3 From 559ff68b31eabdf1025fba2fcc386b504256a0b2 Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Thu, 5 Mar 2015 17:42:05 +0000 Subject: Get rid of servo_util --- components/layout/construct.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/layout/construct.rs') diff --git a/components/layout/construct.rs b/components/layout/construct.rs index b263c438149..b8dd5a8415e 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -50,7 +50,7 @@ use script::dom::element::ElementTypeId; use script::dom::htmlelement::HTMLElementTypeId; use script::dom::htmlobjectelement::is_image_data; use script::dom::node::NodeTypeId; -use servo_util::opts; +use util::opts; use std::borrow::ToOwned; use std::collections::DList; use std::mem; -- cgit v1.2.3