aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/block.rs2
-rw-r--r--components/layout/construct.rs4
-rw-r--r--components/layout/display_list_builder.rs1
-rw-r--r--components/layout/fragment.rs2
-rw-r--r--components/layout/layout_thread.rs4
-rw-r--r--components/layout/parallel.rs4
-rw-r--r--components/layout/query.rs2
-rw-r--r--components/layout/sequential.rs6
-rw-r--r--components/layout/table_caption.rs2
-rw-r--r--components/layout/table_colgroup.rs2
-rw-r--r--components/layout/text.rs2
-rw-r--r--components/layout/webrender_helpers.rs2
-rw-r--r--components/layout/wrapper.rs4
13 files changed, 15 insertions, 22 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs
index 090672c00fb..42cc4e6abd4 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -37,7 +37,7 @@ use flow::{BLOCK_POSITION_IS_STATIC, CLEARS_LEFT, CLEARS_RIGHT};
use flow::{CONTAINS_TEXT_OR_REPLACED_FRAGMENTS, INLINE_POSITION_IS_STATIC};
use flow::{IS_ABSOLUTELY_POSITIONED};
use flow::{ImmutableFlowUtils, LateAbsolutePositionInfo, MutableFlowUtils, OpaqueFlow};
-use flow::{NEEDS_LAYER, PostorderFlowTraversal, PreorderFlowTraversal, FragmentationContext};
+use flow::{NEEDS_LAYER, PreorderFlowTraversal, FragmentationContext};
use flow::{self, BaseFlow, EarlyAbsolutePositionInfo, Flow, FlowClass, ForceNonfloatedFlag};
use flow_list::FlowList;
use flow_ref::FlowRef;
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index dc6ca7b3cb1..2a75c4025cb 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -20,7 +20,7 @@ use data::{HAS_NEWLY_CONSTRUCTED_FLOW, PrivateLayoutData};
use flex::FlexFlow;
use floats::FloatKind;
use flow::{MutableFlowUtils, MutableOwnedFlowUtils, CAN_BE_FRAGMENTED};
-use flow::{self, AbsoluteDescendants, Flow, IS_ABSOLUTELY_POSITIONED, ImmutableFlowUtils};
+use flow::{self, AbsoluteDescendants, IS_ABSOLUTELY_POSITIONED, ImmutableFlowUtils};
use flow_ref::{self, FlowRef};
use fragment::{CanvasFragmentInfo, ImageFragmentInfo, InlineAbsoluteFragmentInfo};
use fragment::{Fragment, GeneratedContentInfo, IframeFragmentInfo};
@@ -60,7 +60,7 @@ use traversal::PostorderNodeMutTraversal;
use url::Url;
use util::linked_list;
use util::opts;
-use wrapper::{LayoutNode, PseudoElementType, TextContent, ThreadSafeLayoutElement, ThreadSafeLayoutNode};
+use wrapper::{PseudoElementType, TextContent, ThreadSafeLayoutElement, ThreadSafeLayoutNode};
/// The results of flow construction for a DOM node.
#[derive(Clone)]
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 495c22e7589..c9314aa08f6 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -15,7 +15,6 @@ use azure::azure_hl::Color;
use block::{BlockFlow, BlockStackingContextType};
use canvas_traits::{CanvasMsg, CanvasData, FromLayoutMsg};
use context::LayoutContext;
-use euclid::num::Zero;
use euclid::{Matrix4D, Point2D, Point3D, Rect, SideOffsets2D, Size2D};
use flex::FlexFlow;
use flow::{BaseFlow, Flow, IS_ABSOLUTELY_POSITIONED};
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 1d9b5056c06..520e4c5ab66 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -11,7 +11,7 @@ use canvas_traits::CanvasMsg;
use context::LayoutContext;
use euclid::{Point2D, Rect, Size2D};
use floats::ClearType;
-use flow::{self, Flow, ImmutableFlowUtils};
+use flow::{self, ImmutableFlowUtils};
use flow_ref::{self, FlowRef};
use gfx;
use gfx::display_list::{BLUR_INFLATION_FACTOR, FragmentType, OpaqueNode, StackingContextId};
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs
index 0712e302752..e20e0865b4c 100644
--- a/components/layout/layout_thread.rs
+++ b/components/layout/layout_thread.rs
@@ -18,7 +18,7 @@ use euclid::point::Point2D;
use euclid::rect::Rect;
use euclid::scale_factor::ScaleFactor;
use euclid::size::Size2D;
-use flow::{self, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
+use flow::{self, Flow, ImmutableFlowUtils, MutableOwnedFlowUtils};
use flow_ref::{self, FlowRef};
use fnv::FnvHasher;
use gfx::display_list::{ClippingRegion, DisplayItemMetadata, DisplayList, LayerInfo};
@@ -87,7 +87,7 @@ use util::thread_state;
use util::workqueue::WorkQueue;
use webrender_helpers::{WebRenderDisplayListConverter, WebRenderFrameBuilder};
use webrender_traits;
-use wrapper::{LayoutNode, NonOpaqueStyleAndLayoutData, ServoLayoutNode, ThreadSafeLayoutNode};
+use wrapper::{LayoutNode, NonOpaqueStyleAndLayoutData, ServoLayoutNode};
/// The number of screens of data we're allowed to generate display lists for in each direction.
pub const DISPLAY_PORT_SIZE_FACTOR: i32 = 8;
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs
index e74f9631ff1..2c622b99603 100644
--- a/components/layout/parallel.rs
+++ b/components/layout/parallel.rs
@@ -14,11 +14,11 @@ use flow_ref::{self, FlowRef};
use profile_traits::time::{self, TimerMetadata, profile};
use std::mem;
use std::sync::atomic::{AtomicIsize, Ordering};
-use style::dom::{TNode, UnsafeNode};
+use style::dom::UnsafeNode;
use style::parallel::{CHUNK_SIZE, WorkQueueData};
use style::parallel::{run_queue_with_custom_work_data_type};
use traversal::AssignBSizes;
-use traversal::{AssignISizes, BubbleISizes, PostorderNodeMutTraversal};
+use traversal::{AssignISizes, BubbleISizes};
use util::opts;
use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy};
diff --git a/components/layout/query.rs b/components/layout/query.rs
index df94ed0024e..6e49b397e8d 100644
--- a/components/layout/query.rs
+++ b/components/layout/query.rs
@@ -19,7 +19,7 @@ use msg::constellation_msg::ConstellationChan;
use opaque_node::OpaqueNodeMethods;
use script::layout_interface::{ContentBoxResponse, NodeOverflowResponse, ContentBoxesResponse, NodeGeometryResponse};
use script::layout_interface::{HitTestResponse, LayoutRPC, OffsetParentResponse, NodeLayerIdResponse};
-use script::layout_interface::{ResolvedStyleResponse, ScriptLayoutChan, MarginStyleResponse};
+use script::layout_interface::{ResolvedStyleResponse, MarginStyleResponse};
use script_traits::LayoutMsg as ConstellationMsg;
use script_traits::UntrustedNodeAddress;
use sequential;
diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
index 16aa0d5f277..d652d19b773 100644
--- a/components/layout/sequential.rs
+++ b/components/layout/sequential.rs
@@ -17,10 +17,7 @@ use fragment::FragmentBorderBoxIterator;
use generated_content::ResolveGeneratedContent;
use gfx::display_list::{DisplayItem, StackingContext};
use incremental::{REFLOW, STORE_OVERFLOW};
-use style::dom::TNode;
-use style::traversal::DomTraversalContext;
-use traversal::{AssignBSizes, AssignISizes, BubbleISizes, BuildDisplayList};
-use traversal::{ComputeAbsolutePositions, PostorderNodeMutTraversal};
+use traversal::{AssignBSizes, AssignISizes, BubbleISizes, BuildDisplayList, ComputeAbsolutePositions};
use util::opts;
pub use style::sequential::traverse_dom;
@@ -158,4 +155,3 @@ pub fn guess_float_placement(flow: &mut Flow) {
floats_in.compute_floats_out(flow);
flow::mut_base(flow).speculated_float_placement_out = floats_in
}
-
diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs
index 0d4d9f91cc2..2f26e7ea2ae 100644
--- a/components/layout/table_caption.rs
+++ b/components/layout/table_caption.rs
@@ -17,7 +17,7 @@ use gfx::display_list::{StackingContext, StackingContextId};
use std::fmt;
use std::sync::Arc;
use style::logical_geometry::LogicalSize;
-use style::properties::{ComputedValues, ServoComputedValues};
+use style::properties::ServoComputedValues;
use util::print_tree::PrintTree;
/// A table formatting context.
diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs
index 0bd52ecc55c..86192f75c52 100644
--- a/components/layout/table_colgroup.rs
+++ b/components/layout/table_colgroup.rs
@@ -18,7 +18,7 @@ use std::cmp::max;
use std::fmt;
use std::sync::Arc;
use style::logical_geometry::LogicalSize;
-use style::properties::{ComputedValues, ServoComputedValues};
+use style::properties::ServoComputedValues;
use style::values::computed::LengthOrPercentageOrAuto;
/// A table formatting context.
diff --git a/components/layout/text.rs b/components/layout/text.rs
index 2ee93282822..1848a9b8741 100644
--- a/components/layout/text.rs
+++ b/components/layout/text.rs
@@ -16,7 +16,7 @@ use gfx::text::glyph::ByteIndex;
use gfx::text::text_run::TextRun;
use gfx::text::util::{self, CompressionMode};
use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFragments, LAST_FRAGMENT_OF_ELEMENT};
-use range::{Range, RangeIndex};
+use range::Range;
use std::borrow::ToOwned;
use std::collections::LinkedList;
use std::mem;
diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs
index 06c94414fd3..3a8d175cdf3 100644
--- a/components/layout/webrender_helpers.rs
+++ b/components/layout/webrender_helpers.rs
@@ -9,7 +9,6 @@
use app_units::Au;
use azure::azure_hl::Color;
-use euclid::num::Zero;
use euclid::{Point2D, Rect, Size2D};
use gfx::display_list::{BorderRadii, BoxShadowClipMode, ClippingRegion};
use gfx::display_list::{DisplayItem, DisplayList};
@@ -565,4 +564,3 @@ impl WebRenderFrameBuilder {
}
}
-
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 12d2e0f3b8a..9c4193e16f1 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -38,9 +38,9 @@ use gfx_traits::{LayerId, LayerType};
use incremental::RestyleDamage;
use msg::constellation_msg::PipelineId;
use opaque_node::OpaqueNodeMethods;
-use range::{Range, RangeIndex};
+use range::Range;
use script::dom::attr::AttrValue;
-use script::dom::bindings::inheritance::{Castable, CharacterDataTypeId, ElementTypeId};
+use script::dom::bindings::inheritance::{CharacterDataTypeId, ElementTypeId};
use script::dom::bindings::inheritance::{HTMLElementTypeId, NodeTypeId};
use script::dom::bindings::js::LayoutJS;
use script::dom::characterdata::LayoutCharacterDataHelpers;