diff options
Diffstat (limited to 'components/layout')
26 files changed, 49 insertions, 26 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index 4742791d889..b9614601458 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -43,15 +43,17 @@ use crate::fragment::{ CoordinateSystem, Fragment, FragmentBorderBoxIterator, FragmentFlags, Overflow, }; use crate::incremental::RelayoutMode; -use crate::layout_debug; use crate::model::{ AdjoiningMargins, CollapsibleMargins, IntrinsicISizes, MarginCollapseInfo, MaybeAuto, }; use crate::sequential; use crate::traversal::PreorderFlowTraversal; +use crate::{layout_debug, layout_debug_scope}; use app_units::{Au, MAX_AU}; +use bitflags::bitflags; use euclid::default::{Point2D, Rect, SideOffsets2D, Size2D}; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; use serde::{Serialize, Serializer}; use servo_geometry::MaxRect; use std::cmp::{max, min}; diff --git a/components/layout/construct.rs b/components/layout/construct.rs index d9531be391f..5f5caba6fbc 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -48,6 +48,8 @@ use crate::text::TextRunScanner; use crate::traversal::PostorderNodeMutTraversal; use crate::wrapper::{LayoutNodeLayoutData, TextContent, ThreadSafeLayoutNodeHelpers}; use crate::ServoArc; +use html5ever::{local_name, namespace_url, ns}; +use log::debug; use script_layout_interface::wrapper_traits::{ PseudoElementType, ThreadSafeLayoutElement, ThreadSafeLayoutNode, }; diff --git a/components/layout/data.rs b/components/layout/data.rs index 96112a8523a..720f168e732 100644 --- a/components/layout/data.rs +++ b/components/layout/data.rs @@ -4,6 +4,7 @@ use crate::construct::ConstructionResult; use atomic_refcell::AtomicRefCell; +use bitflags::bitflags; use script_layout_interface::wrapper_traits::LayoutDataTrait; use script_layout_interface::StyleData; diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index ac0caa51518..e6980ebdd6a 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -32,6 +32,7 @@ use crate::inline::InlineFragmentNodeFlags; use crate::model::MaybeAuto; use crate::table_cell::CollapsedBordersForCell; use app_units::{Au, AU_PER_PX}; +use bitflags::bitflags; use canvas_traits::canvas::{CanvasMsg, FromLayoutMsg}; use embedder_traits::Cursor; use euclid::{ @@ -43,6 +44,7 @@ use gfx::text::glyph::ByteIndex; use gfx::text::TextRun; use gfx_traits::{combine_id_with_fragment_type, FragmentType, StackingContextId}; use ipc_channel::ipc; +use log::{debug, warn}; use msg::constellation_msg::{BrowsingContextId, PipelineId}; use net_traits::image_cache::UsePlaceholder; use range::Range; diff --git a/components/layout/display_list/items.rs b/components/layout/display_list/items.rs index b1de022d819..9b87a7c0bb4 100644 --- a/components/layout/display_list/items.rs +++ b/components/layout/display_list/items.rs @@ -19,6 +19,7 @@ use gfx_traits::{self, StackingContextId}; use msg::constellation_msg::PipelineId; use net_traits::image::base::Image; use script_traits::compositor::ScrollTreeNodeId; +use serde::Serialize; use servo_geometry::MaxRect; use std::cmp::Ordering; use std::collections::HashMap; diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs index 103ac139d1a..74fd41d22c2 100644 --- a/components/layout/display_list/webrender_helpers.rs +++ b/components/layout/display_list/webrender_helpers.rs @@ -9,6 +9,7 @@ use crate::display_list::items::{BaseDisplayItem, ClipScrollNode, ClipScrollNodeType, ClipType}; use crate::display_list::items::{DisplayItem, DisplayList, StackingContextType}; +use log::trace; use msg::constellation_msg::PipelineId; use script_traits::compositor::{CompositorDisplayListInfo, ScrollTreeNodeId, ScrollableNodeInfo}; use webrender_api::units::{LayoutPoint, LayoutSize, LayoutVector2D}; diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 4a21b563edc..b2517a61cff 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -12,12 +12,14 @@ use crate::display_list::{ use crate::floats::FloatKind; use crate::flow::{Flow, FlowClass, FlowFlags, GetBaseFlow, ImmutableFlowUtils, OpaqueFlow}; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; use crate::model::{self, AdjoiningMargins, CollapsibleMargins}; use crate::model::{IntrinsicISizes, MaybeAuto, SizeConstraint}; use crate::traversal::PreorderFlowTraversal; +use crate::{layout_debug, layout_debug_scope}; use app_units::{Au, MAX_AU}; use euclid::default::Point2D; +use log::debug; +use serde::Serialize; use std::cmp::{max, min}; use std::ops::Range; use style::computed_values::align_content::T as AlignContent; diff --git a/components/layout/floats.rs b/components/layout/floats.rs index b629e2bb83c..9e8e698e0b5 100644 --- a/components/layout/floats.rs +++ b/components/layout/floats.rs @@ -6,6 +6,8 @@ use crate::block::FormattingContextType; use crate::flow::{Flow, FlowFlags, GetBaseFlow, ImmutableFlowUtils}; use crate::persistent_list::PersistentList; use app_units::{Au, MAX_AU}; +use log::debug; +use serde::Serialize; use std::cmp::{max, min}; use std::fmt; use style::computed_values::float::T as StyleFloat; diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 24b804a5bfd..2a2d9a06539 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -44,10 +44,13 @@ use crate::table_row::TableRowFlow; use crate::table_rowgroup::TableRowGroupFlow; use crate::table_wrapper::TableWrapperFlow; use app_units::Au; +use bitflags::bitflags; use euclid::default::{Point2D, Rect, Size2D, Vector2D}; use gfx_traits::print_tree::PrintTree; use gfx_traits::StackingContextId; -use serde::ser::{Serialize, SerializeStruct, Serializer}; +use log::debug; +use serde::ser::{SerializeStruct, Serializer}; +use serde::Serialize; use servo_geometry::{au_rect_to_f32_rect, f32_rect_to_au_rect, MaxRect}; use std::fmt; use std::slice::IterMut; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 98e04fd3d3d..8df20e18e9d 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -21,12 +21,15 @@ use crate::text::TextRunScanner; use crate::wrapper::ThreadSafeLayoutNodeHelpers; use crate::ServoArc; use app_units::Au; +use bitflags::bitflags; use canvas_traits::canvas::{CanvasId, CanvasMsg}; use euclid::default::{Point2D, Rect, Size2D, Vector2D}; use gfx::text::glyph::ByteIndex; use gfx::text::text_run::{TextRun, TextRunSlice}; use gfx_traits::StackingContextId; +use html5ever::{local_name, namespace_url, ns}; use ipc_channel::ipc::IpcSender; +use log::debug; use msg::constellation_msg::{BrowsingContextId, PipelineId}; use net_traits::image::base::{Image, ImageMetadata}; use net_traits::image_cache::{ImageOrMetadataAvailable, UsePlaceholder}; @@ -37,6 +40,7 @@ use script_layout_interface::wrapper_traits::{ use script_layout_interface::{HTMLCanvasData, HTMLCanvasDataSource, HTMLMediaData, SVGSVGData}; use serde::ser::{Serialize, SerializeStruct, Serializer}; use servo_url::ServoUrl; +use size_of_test::size_of_test; use std::borrow::ToOwned; use std::cmp::{max, min, Ordering}; use std::collections::LinkedList; diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs index 90e17fe3e8c..4c57e2d77e6 100644 --- a/components/layout/generated_content.rs +++ b/components/layout/generated_content.rs @@ -16,6 +16,7 @@ use crate::fragment::{ }; use crate::text::TextRunScanner; use crate::traversal::InorderFlowTraversal; +use lazy_static::lazy_static; use script_layout_interface::wrapper_traits::PseudoElementType; use smallvec::SmallVec; use std::collections::{HashMap, LinkedList}; diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs index a1191695205..1ffeafc5662 100644 --- a/components/layout/incremental.rs +++ b/components/layout/incremental.rs @@ -3,6 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::flow::{Flow, FlowFlags, GetBaseFlow}; +use bitflags::bitflags; use style::computed_values::float::T as Float; use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::ServoRestyleDamage; diff --git a/components/layout/inline.rs b/components/layout/inline.rs index c7e7ee1027d..c09e33a7bac 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -15,17 +15,20 @@ use crate::flow_ref::FlowRef; use crate::fragment::FragmentFlags; use crate::fragment::SpecificFragmentInfo; use crate::fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; use crate::model::IntrinsicISizesContribution; use crate::text; use crate::traversal::PreorderFlowTraversal; use crate::ServoArc; +use crate::{layout_debug, layout_debug_scope}; use app_units::{Au, MIN_AU}; +use bitflags::bitflags; use euclid::default::{Point2D, Rect, Size2D}; use gfx::font::FontMetrics; use gfx_traits::print_tree::PrintTree; -use range::{Range, RangeIndex}; +use log::debug; +use range::{int_range_index, Range, RangeIndex}; use script_layout_interface::wrapper_traits::PseudoElementType; +use serde::Serialize; use servo_geometry::MaxRect; use std::cmp::max; use std::collections::VecDeque; diff --git a/components/layout/layout_debug.rs b/components/layout/layout_debug.rs index d3af6b4d8d5..2753ef84922 100644 --- a/components/layout/layout_debug.rs +++ b/components/layout/layout_debug.rs @@ -7,6 +7,7 @@ use crate::flow::GetBaseFlow; use crate::flow_ref::FlowRef; +use serde::Serialize; use serde_json::{to_string, to_value, Value}; use std::borrow::ToOwned; use std::cell::RefCell; diff --git a/components/layout/lib.rs b/components/layout/lib.rs index aab98048a54..7e6544e5a8a 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -4,22 +4,6 @@ #![deny(unsafe_code)] -#[macro_use] -extern crate bitflags; -#[macro_use] -extern crate html5ever; -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate log; -#[macro_use] -extern crate range; -#[macro_use] -extern crate serde; -#[macro_use] -extern crate size_of_test; - -#[macro_use] pub mod layout_debug; mod block; diff --git a/components/layout/model.rs b/components/layout/model.rs index 08f916142e9..d9719442186 100644 --- a/components/layout/model.rs +++ b/components/layout/model.rs @@ -7,6 +7,7 @@ use crate::fragment::Fragment; use app_units::Au; use euclid::SideOffsets2D; +use serde::Serialize; use std::cmp::{max, min}; use std::fmt; use style::logical_geometry::{LogicalMargin, WritingMode}; diff --git a/components/layout/multicol.rs b/components/layout/multicol.rs index 2e7890a8be5..e1a0ef92911 100644 --- a/components/layout/multicol.rs +++ b/components/layout/multicol.rs @@ -14,6 +14,7 @@ use crate::ServoArc; use app_units::Au; use euclid::default::{Point2D, Vector2D}; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; use std::cmp::{max, min}; use std::fmt; use std::sync::Arc; diff --git a/components/layout/table.rs b/components/layout/table.rs index 36c78d9bb81..b067b5ffdc4 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -17,15 +17,17 @@ use crate::flow::{ }; use crate::flow_list::{FlowListIterator, MutFlowListIterator}; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; use crate::model::{IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto}; use crate::table_cell::TableCellFlow; use crate::table_row::{self, CellIntrinsicInlineSize, CollapsedBorder, CollapsedBorderProvenance}; use crate::table_row::{TableRowFlow, TableRowSizeData}; use crate::table_wrapper::TableLayout; +use crate::{layout_debug, layout_debug_scope}; use app_units::Au; use euclid::default::Point2D; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; +use serde::Serialize; use std::{cmp, fmt}; use style::computed_values::{border_collapse, border_spacing, table_layout}; use style::context::SharedStyleContext; diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs index 770a0e41be8..b538e9758cb 100644 --- a/components/layout/table_caption.rs +++ b/components/layout/table_caption.rs @@ -14,6 +14,7 @@ use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use app_units::Au; use euclid::default::Point2D; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; use std::fmt; use style::logical_geometry::LogicalSize; use style::properties::ComputedValues; diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 6408da05dee..2ed26c43108 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -11,13 +11,15 @@ use crate::display_list::{ }; use crate::flow::{Flow, FlowClass, FlowFlags, GetBaseFlow, OpaqueFlow}; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; use crate::table::InternalTable; use crate::table_row::{CollapsedBorder, CollapsedBorderProvenance}; +use crate::{layout_debug, layout_debug_scope}; use app_units::Au; use euclid::default::{Point2D, Rect, SideOffsets2D, Size2D}; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; use script_layout_interface::wrapper_traits::ThreadSafeLayoutNode; +use serde::Serialize; use std::fmt; use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode}; use style::properties::ComputedValues; diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs index ce097083f62..8d66188e8dc 100644 --- a/components/layout/table_colgroup.rs +++ b/components/layout/table_colgroup.rs @@ -8,7 +8,7 @@ use crate::context::LayoutContext; use crate::display_list::{DisplayListBuildState, StackingContextCollectionState}; use crate::flow::{BaseFlow, Flow, FlowClass, ForceNonfloatedFlag, OpaqueFlow}; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; +use crate::{layout_debug, layout_debug_scope}; use app_units::Au; use euclid::default::Point2D; use std::fmt; diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index b9090c39c94..2a9f140b630 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -14,12 +14,13 @@ use crate::flow::{ }; use crate::flow_list::MutFlowListIterator; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; use crate::table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, VecExt}; use crate::table_cell::{CollapsedBordersForCell, TableCellFlow}; +use crate::{layout_debug, layout_debug_scope}; use app_units::Au; use euclid::default::Point2D; use gfx_traits::print_tree::PrintTree; +use log::{debug, warn}; use serde::{Serialize, Serializer}; use std::cmp::max; use std::fmt; diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs index 22a66b07a7d..08177322441 100644 --- a/components/layout/table_rowgroup.rs +++ b/components/layout/table_rowgroup.rs @@ -11,11 +11,12 @@ use crate::display_list::{ }; use crate::flow::{Flow, FlowClass, OpaqueFlow}; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; -use crate::layout_debug; use crate::table::{ColumnIntrinsicInlineSize, InternalTable, TableLikeFlow}; +use crate::{layout_debug, layout_debug_scope}; use app_units::Au; use euclid::default::Point2D; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; use serde::{Serialize, Serializer}; use std::fmt; use std::iter::{IntoIterator, Iterator, Peekable}; diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index 92532f8f706..07d4375c678 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -26,6 +26,8 @@ use crate::table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize}; use app_units::Au; use euclid::default::Point2D; use gfx_traits::print_tree::PrintTree; +use log::{debug, trace}; +use serde::Serialize; use std::cmp::{max, min}; use std::fmt; use std::ops::Add; diff --git a/components/layout/text.rs b/components/layout/text.rs index 979443feae4..77b52927e6a 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -14,6 +14,7 @@ use gfx::font::{self, FontMetrics, FontRef, RunMetrics, ShapingFlags, ShapingOpt use gfx::text::glyph::ByteIndex; use gfx::text::text_run::TextRun; use gfx::text::util::{self, CompressionMode}; +use log::debug; use range::Range; use servo_atoms::Atom; use std::borrow::ToOwned; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 840aba5ef05..cf5b4828a5f 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -10,6 +10,7 @@ use crate::display_list::DisplayListBuildState; use crate::flow::{Flow, FlowFlags, GetBaseFlow, ImmutableFlowUtils}; use crate::wrapper::ThreadSafeLayoutNodeHelpers; use crate::wrapper::{GetStyleAndLayoutData, LayoutNodeLayoutData}; +use log::debug; use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode}; use servo_config::opts; use style::context::{SharedStyleContext, StyleContext}; |