diff options
| -rw-r--r-- | components/script/layout_interface.rs | 11 | ||||
| -rw-r--r-- | components/script/layout_wrapper.rs | 15 |
2 files changed, 9 insertions, 17 deletions
diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 3c5516e4b8d..b06940ea227 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -27,18 +27,7 @@ use style::servo::Stylesheet; use url::Url; use util::ipc::OptionalOpaqueIpcSender; -pub use dom::bindings::inheritance::{CharacterDataTypeId, ElementTypeId}; -pub use dom::bindings::inheritance::{HTMLElementTypeId, NodeTypeId}; -pub use dom::bindings::js::LayoutJS; -pub use dom::characterdata::LayoutCharacterDataHelpers; -pub use dom::document::{Document, LayoutDocumentHelpers}; -pub use dom::element::{Element, LayoutElementHelpers, RawLayoutElementHelpers}; pub use dom::htmlobjectelement::is_image_data; -pub use dom::node::{CAN_BE_FRAGMENTED, HAS_CHANGED, HAS_DIRTY_DESCENDANTS, IS_DIRTY}; -pub use dom::node::LayoutNodeHelpers; -pub use dom::node::Node; -pub use dom::text::Text; - /// Asynchronous messages that script can send to layout. pub enum Msg { diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 1ef916ea500..2fc6991310e 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -30,13 +30,16 @@ #![allow(unsafe_code)] +use dom::bindings::inheritance::{CharacterDataTypeId, ElementTypeId}; +use dom::bindings::inheritance::{HTMLElementTypeId, NodeTypeId}; +use dom::bindings::js::LayoutJS; +use dom::characterdata::LayoutCharacterDataHelpers; +use dom::document::{Document, LayoutDocumentHelpers}; +use dom::element::{Element, LayoutElementHelpers, RawLayoutElementHelpers}; +use dom::node::{CAN_BE_FRAGMENTED, HAS_CHANGED, HAS_DIRTY_DESCENDANTS, IS_DIRTY}; +use dom::node::{Node, LayoutNodeHelpers}; +use dom::text::Text; use gfx_traits::ByteIndex; -use layout_interface::{CAN_BE_FRAGMENTED, HAS_CHANGED, HAS_DIRTY_DESCENDANTS, IS_DIRTY}; -use layout_interface::{CharacterDataTypeId, Document, Element, ElementTypeId}; -use layout_interface::{HTMLElementTypeId, LayoutCharacterDataHelpers}; -use layout_interface::{LayoutDocumentHelpers, LayoutElementHelpers, LayoutJS}; -use layout_interface::{LayoutNodeHelpers, Node, NodeTypeId}; -use layout_interface::{RawLayoutElementHelpers, Text}; use msg::constellation_msg::PipelineId; use range::Range; use script_layout_interface::restyle_damage::RestyleDamage; |