diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index b77847eb1c8..9e540b7d7af 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -14,6 +14,7 @@ use euclid::rect::TypedRect; use euclid::scale_factor::ScaleFactor; use euclid::size::TypedSize2D; use euclid::{Matrix4D, Point2D, Rect, Size2D}; +use gfx_traits::print_tree::PrintTree; use gfx_traits::{ChromeToPaintMsg, PaintRequest, ScrollPolicy, StackingContextId}; use gfx_traits::{color, Epoch, FrameTreeId, FragmentType, LayerId, LayerKind, LayerProperties}; use gleam::gl; @@ -51,7 +52,6 @@ use url::Url; use util::geometry::{PagePx, ScreenPx, ViewportPx}; use util::opts; use util::prefs::PREFS; -use util::print_tree::PrintTree; use webrender; use webrender_traits::{self, ScrollEventPhase}; use windowing::{self, MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg}; diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 25b7c46075f..3eed504303b 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -23,6 +23,7 @@ use euclid::rect::TypedRect; use euclid::side_offsets::SideOffsets2D; use euclid::{Matrix2D, Matrix4D, Point2D, Rect, Size2D}; use fnv::FnvHasher; +use gfx_traits::print_tree::PrintTree; use gfx_traits::{LayerId, ScrollPolicy, StackingContextId}; use ipc_channel::ipc::IpcSharedMemory; use msg::constellation_msg::PipelineId; @@ -45,7 +46,6 @@ use style_traits::cursor::Cursor; use text::TextRun; use text::glyph::ByteIndex; use util::geometry::{self, MAX_RECT, ScreenPx}; -use util::print_tree::PrintTree; use webrender_traits::{self, WebGLContextId}; pub use style::dom::OpaqueNode; diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 9d01f883389..8b34d1b3b78 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -23,6 +23,7 @@ extern crate serde; pub mod color; mod paint_listener; +pub mod print_tree; pub use paint_listener::PaintListener; use azure::azure_hl::Color; diff --git a/components/util/print_tree.rs b/components/gfx_traits/print_tree.rs similarity index 100% rename from components/util/print_tree.rs rename to components/gfx_traits/print_tree.rs diff --git a/components/layout/block.rs b/components/layout/block.rs index ab810c59521..41d382f3004 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -44,6 +44,7 @@ use flow_ref::FlowRef; use fragment::SpecificFragmentInfo; use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, HAS_LAYER, Overflow}; use gfx::display_list::{ClippingRegion, StackingContext}; +use gfx_traits::print_tree::PrintTree; use gfx_traits::{LayerId, StackingContextId}; use layout_debug; use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none}; @@ -62,7 +63,6 @@ use style::servo::SharedStyleContext; use style::values::computed::{LengthOrNone, LengthOrPercentageOrNone}; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; use util::geometry::MAX_RECT; -use util::print_tree::PrintTree; /// The number of screens of data we're allowed to generate display lists for in each direction. const DISPLAY_PORT_SIZE_FACTOR: i32 = 8; diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 73277288e3b..1c53740c402 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -35,6 +35,7 @@ use flow_list::{FlowList, FlowListIterator, MutFlowListIterator}; use flow_ref::{self, FlowRef, WeakFlowRef}; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow, SpecificFragmentInfo}; use gfx::display_list::{ClippingRegion, StackingContext}; +use gfx_traits::print_tree::PrintTree; use gfx_traits::{LayerId, LayerType, StackingContextId}; use inline::InlineFlow; use model::{CollapsibleMargins, IntrinsicISizes, MarginCollapseInfo}; @@ -61,7 +62,6 @@ use table_colgroup::TableColGroupFlow; use table_row::TableRowFlow; use table_rowgroup::TableRowGroupFlow; use table_wrapper::TableWrapperFlow; -use util::print_tree::PrintTree; /// Virtual methods that make up a float context. /// diff --git a/components/layout/inline.rs b/components/layout/inline.rs index af1f6c878cd..6195024f2ca 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -21,6 +21,7 @@ use gfx::display_list::{OpaqueNode, StackingContext}; use gfx::font::FontMetrics; use gfx::font_context::FontContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use layout_debug; use model::IntrinsicISizesContribution; use range::{Range, RangeIndex}; @@ -41,7 +42,6 @@ use style::values::computed::LengthOrPercentage; use text; use unicode_bidi; use util; -use util::print_tree::PrintTree; // From gfxFontConstants.h in Firefox static FONT_SUBSCRIPT_OFFSET_RATIO: f32 = 0.20; diff --git a/components/layout/multicol.rs b/components/layout/multicol.rs index e8e974ec5a2..e2bb1a66f79 100644 --- a/components/layout/multicol.rs +++ b/components/layout/multicol.rs @@ -17,6 +17,7 @@ use flow_ref::{self, FlowRef}; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use std::cmp::{min, max}; use std::fmt; use std::sync::Arc; @@ -25,7 +26,6 @@ use style::logical_geometry::LogicalSize; use style::properties::{ComputedValues, ServoComputedValues}; use style::servo::SharedStyleContext; use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; -use util::print_tree::PrintTree; pub struct MulticolFlow { pub block_flow: BlockFlow, diff --git a/components/layout/table.rs b/components/layout/table.rs index 0299d9b9b01..4f41cdb681f 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -18,6 +18,7 @@ use flow_list::MutFlowListIterator; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use layout_debug; use model::{IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto}; use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; @@ -33,7 +34,6 @@ use style::values::computed::LengthOrPercentageOrAuto; use table_row::TableRowFlow; use table_row::{self, CellIntrinsicInlineSize, CollapsedBorder, CollapsedBorderProvenance}; use table_wrapper::TableLayout; -use util::print_tree::PrintTree; /// A table flow corresponded to the table's internal table fragment under a table wrapper flow. /// The properties `position`, `float`, and `margin-*` are used on the table wrapper fragment, diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs index ad7c43d3f99..aaa038a4b57 100644 --- a/components/layout/table_caption.rs +++ b/components/layout/table_caption.rs @@ -15,12 +15,12 @@ use flow::{Flow, FlowClass, OpaqueFlow}; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use std::fmt; use std::sync::Arc; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; use style::servo::SharedStyleContext; -use util::print_tree::PrintTree; /// A table formatting context. pub struct TableCaptionFlow { diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 8b6db89ff38..58bb96cfbf6 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -16,6 +16,7 @@ use flow::{self, Flow, FlowClass, OpaqueFlow}; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use layout_debug; use model::MaybeAuto; use script_layout_interface::restyle_damage::REFLOW; @@ -28,7 +29,6 @@ use style::properties::{ComputedValues, ServoComputedValues}; use style::servo::SharedStyleContext; use table::InternalTable; use table_row::{CollapsedBorder, CollapsedBorderProvenance}; -use util::print_tree::PrintTree; /// A table formatting context. #[derive(RustcEncodable)] diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index b8835d493ef..0406b7a806b 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -17,6 +17,7 @@ use flow_list::MutFlowListIterator; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use layout_debug; use model::MaybeAuto; use rustc_serialize::{Encodable, Encoder}; @@ -31,7 +32,6 @@ use style::servo::SharedStyleContext; use style::values::computed::LengthOrPercentageOrAuto; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, VecExt}; use table_cell::{CollapsedBordersForCell, TableCellFlow}; -use util::print_tree::PrintTree; /// A single row of a table. pub struct TableRowFlow { diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs index 91dcb0f00a2..21d6a00cb74 100644 --- a/components/layout/table_rowgroup.rs +++ b/components/layout/table_rowgroup.rs @@ -15,6 +15,7 @@ use flow::{Flow, FlowClass, OpaqueFlow}; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use layout_debug; use rustc_serialize::{Encodable, Encoder}; use std::fmt; @@ -26,7 +27,6 @@ use style::properties::{ComputedValues, ServoComputedValues}; use style::servo::SharedStyleContext; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, TableLikeFlow}; use table_row; -use util::print_tree::PrintTree; /// A table formatting context. pub struct TableRowGroupFlow { diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index c331cd9ee2a..b88819274e1 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -24,6 +24,7 @@ use flow::{Flow, FlowClass, ImmutableFlowUtils, INLINE_POSITION_IS_STATIC, Opaqu use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; +use gfx_traits::print_tree::PrintTree; use model::MaybeAuto; use std::cmp::{max, min}; use std::fmt; @@ -37,7 +38,6 @@ use style::values::CSSFloat; use style::values::computed::LengthOrPercentageOrAuto; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize}; use table_row; -use util::print_tree::PrintTree; #[derive(Copy, Clone, RustcEncodable, Debug)] pub enum TableLayout { diff --git a/components/util/lib.rs b/components/util/lib.rs index 84c86a982ed..46c194ca91a 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -42,7 +42,6 @@ pub mod geometry; #[allow(unsafe_code)] pub mod opts; #[cfg(feature = "servo")] pub mod panicking; pub mod prefs; -#[cfg(feature = "servo")] pub mod print_tree; pub mod resource_files; pub mod str; pub mod thread;