Make layout only depend on script::layout_interface.

5 files changed, 13 insertions, 18 deletions

diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 8d37b6aa6ba..3dfcfdf2689 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -34,9 +34,9 @@ use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT};
 use list_item::{ListItemFlow, ListStyleTypeContent};
 use multicol::{MulticolFlow, MulticolColumnFlow};
 use parallel;
-use script::dom::bindings::inheritance::{CharacterDataTypeId, ElementTypeId};
-use script::dom::bindings::inheritance::{HTMLElementTypeId, NodeTypeId};
-use script::dom::htmlobjectelement::is_image_data;
+use script::layout_interface::is_image_data;
+use script::layout_interface::{CharacterDataTypeId, ElementTypeId};
+use script::layout_interface::{HTMLElementTypeId, NodeTypeId};
 use std::borrow::ToOwned;
 use std::collections::LinkedList;
 use std::marker::PhantomData;
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 705868a5afe..640b7acce1a 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -30,7 +30,7 @@ use net_traits::image::base::{Image, ImageMetadata};
 use net_traits::image_cache_thread::{ImageOrMetadataAvailable, UsePlaceholder};
 use range::*;
 use rustc_serialize::{Encodable, Encoder};
-use script::dom::htmlcanvaselement::HTMLCanvasData;
+use script::layout_interface::HTMLCanvasData;
 use std::borrow::ToOwned;
 use std::cmp::{max, min};
 use std::collections::LinkedList;
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs
index b48813a0c31..da6fe4908db 100644
--- a/components/layout/layout_thread.rs
+++ b/components/layout/layout_thread.rs
@@ -47,7 +47,7 @@ use query::process_offset_parent_query;
 use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request};
 use query::{process_node_geometry_request, process_node_layer_id_request, process_node_scroll_area_request};
 use query::{process_node_overflow_request, process_resolved_style_request, process_margin_style_query};
-use script::dom::node::OpaqueStyleAndLayoutData;
+use script::layout_interface::OpaqueStyleAndLayoutData;
 use script::layout_interface::{LayoutRPC, OffsetParentResponse, NodeOverflowResponse, MarginStyleResponse};
 use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowQueryType, ScriptReflow};
 use script::reporter::CSSErrorReporter;
diff --git a/components/layout/opaque_node.rs b/components/layout/opaque_node.rs
index 023b9cb34c0..a05a49d48e6 100644
--- a/components/layout/opaque_node.rs
+++ b/components/layout/opaque_node.rs
@@ -6,8 +6,8 @@
 
 use gfx::display_list::OpaqueNode;
 use libc::{c_void, uintptr_t};
-use script::dom::bindings::js::LayoutJS;
-use script::dom::node::Node;
+use script::layout_interface::LayoutJS;
+use script::layout_interface::Node;
 use script::layout_interface::TrustedNodeAddress;
 use script_traits::UntrustedNodeAddress;
 
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 7c60ed4625b..b6c5266c2cb 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -39,17 +39,12 @@ use incremental::RestyleDamage;
 use msg::constellation_msg::PipelineId;
 use opaque_node::OpaqueNodeMethods;
 use range::Range;
-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;
-use script::dom::document::{Document, LayoutDocumentHelpers};
-use script::dom::element::{Element, LayoutElementHelpers, RawLayoutElementHelpers};
-use script::dom::htmlcanvaselement::HTMLCanvasData;
-use script::dom::node::{CAN_BE_FRAGMENTED, HAS_CHANGED, HAS_DIRTY_DESCENDANTS, IS_DIRTY};
-use script::dom::node::{LayoutNodeHelpers, Node, OpaqueStyleAndLayoutData};
-use script::dom::text::Text;
-use script::layout_interface::TrustedNodeAddress;
+use script::layout_interface::{CAN_BE_FRAGMENTED, HAS_CHANGED, HAS_DIRTY_DESCENDANTS, IS_DIRTY};
+use script::layout_interface::{CharacterDataTypeId, Document, Element, ElementTypeId};
+use script::layout_interface::{HTMLCanvasData, HTMLElementTypeId, LayoutCharacterDataHelpers};
+use script::layout_interface::{LayoutDocumentHelpers, LayoutElementHelpers, LayoutJS};
+use script::layout_interface::{LayoutNodeHelpers, Node, NodeTypeId, OpaqueStyleAndLayoutData};
+use script::layout_interface::{RawLayoutElementHelpers, Text, TrustedNodeAddress};
 use selectors::matching::{DeclarationBlock, ElementFlags};
 use selectors::parser::{AttrSelector, NamespaceConstraint};
 use smallvec::VecLike;