Auto merge of #6443 - Ms2ger:cleanup-layout, r=pcwalton

Various layout cleanup.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6443)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-24 03:00:32 -06:00
commit 469b9550f6
9 changed files with 207 additions and 287 deletions

View file

@ -11,7 +11,7 @@ use animation;
use construct::ConstructionResult;
use context::{SharedLayoutContext, SharedLayoutContextWrapper, heap_size_of_local_context};
use css::node_style::StyledNode;
use data::{LayoutDataAccess, LayoutDataWrapper};
use data::LayoutDataWrapper;
use display_list_builder::ToGfxColor;
use flow::{self, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
use flow_ref::FlowRef;
@ -21,7 +21,7 @@ use layout_debug;
use opaque_node::OpaqueNodeMethods;
use parallel::{self, UnsafeFlow};
use sequential;
use wrapper::{LayoutNode, TLayoutNode};
use wrapper::LayoutNode;
use azure::azure::AzColor;
use canvas_traits::CanvasMsg;