diff --git a/components/layout/animation.rs b/components/layout/animation.rs index 8728977dc12..4deafeafa64 100644 --- a/components/layout/animation.rs +++ b/components/layout/animation.rs @@ -8,12 +8,11 @@ use flow::{self, Flow}; use gfx::display_list::OpaqueNode; use incremental::RestyleDamage; use msg::constellation_msg::{AnimationState, ConstellationChan, PipelineId}; -use script::layout_interface::Animation; use script_traits::LayoutMsg as ConstellationMsg; use std::collections::HashMap; use std::collections::hash_map::Entry; use std::sync::mpsc::Receiver; -use style::animation::update_style_for_animation; +use style::animation::{Animation, update_style_for_animation}; use time; /// Processes any new animations that were discovered after style recalculation. diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index 86b86b2793d..57e92dc8bf2 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -44,9 +44,8 @@ use profile_traits::time::{self, TimerMetadata, profile}; use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request}; use query::{process_node_geometry_request, process_offset_parent_query, process_resolved_style_request}; use script::dom::node::OpaqueStyleAndLayoutData; -use script::layout_interface::Animation; use script::layout_interface::{LayoutRPC, OffsetParentResponse}; -use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowGoal, ReflowQueryType}; +use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowQueryType}; use script::layout_interface::{ScriptLayoutChan, ScriptReflow}; use script::reporter::CSSErrorReporter; use script_traits::ConstellationControlMsg; @@ -62,8 +61,9 @@ use std::ops::{Deref, DerefMut}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::mpsc::{channel, Sender, Receiver}; use std::sync::{Arc, Mutex, MutexGuard, RwLock}; +use style::animation::Animation; use style::computed_values::{filter, mix_blend_mode}; -use style::context::{SharedStyleContext, StylistWrapper}; +use style::context::{SharedStyleContext, StylistWrapper, ReflowGoal}; use style::dom::{TDocument, TElement, TNode}; use style::media_queries::{Device, MediaType}; use style::parallel::WorkQueueData; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 2bda2ce3a7f..32233c13ee6 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -10,9 +10,8 @@ use flow::{PostorderFlowTraversal, PreorderFlowTraversal}; use flow::{self, Flow}; use gfx::display_list::OpaqueNode; use incremental::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, RestyleDamage}; -use script::layout_interface::ReflowGoal; use std::mem; -use style::context::StyleContext; +use style::context::{StyleContext, ReflowGoal}; use style::matching::MatchMethods; use style::traversal::{DomTraversalContext, STYLE_BLOOM}; use style::traversal::{put_thread_local_bloom_filter, recalc_style_at}; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index c4edaa7736c..b9afe0a4c14 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -78,8 +78,7 @@ use html5ever::tree_builder::{LimitedQuirks, NoQuirks, Quirks, QuirksMode}; use ipc_channel::ipc::{self, IpcSender}; use js::jsapi::{JSContext, JSObject, JSRuntime}; use layout_interface::{HitTestResponse, MouseOverResponse}; -use layout_interface::{LayoutChan, Msg}; -use layout_interface::{ReflowGoal, ReflowQueryType}; +use layout_interface::{LayoutChan, Msg, ReflowQueryType}; use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER}; use msg::constellation_msg::{AnimationState, PipelineId}; use msg::constellation_msg::{ConstellationChan, Key, KeyModifiers, KeyState}; @@ -105,6 +104,7 @@ use std::rc::Rc; use std::sync::Arc; use std::sync::mpsc::channel; use string_cache::{Atom, QualName}; +use style::context::ReflowGoal; use style::restyle_hints::ElementSnapshot; use style::stylesheets::Stylesheet; use time; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 8406583ed63..7178b2013cb 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -41,7 +41,7 @@ use js::jsapi::{JSAutoCompartment, JSAutoRequest, JS_GC, JS_GetRuntime}; use js::rust::CompileOptionsWrapper; use js::rust::Runtime; use layout_interface::{ContentBoxResponse, ContentBoxesResponse, ResolvedStyleResponse, ScriptReflow}; -use layout_interface::{LayoutChan, LayoutRPC, Msg, Reflow, ReflowGoal, ReflowQueryType}; +use layout_interface::{LayoutChan, LayoutRPC, Msg, Reflow, ReflowQueryType}; use libc; use msg::ParseErrorReporter; use msg::constellation_msg::{ConstellationChan, DocumentState, LoadData}; @@ -74,6 +74,7 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::TryRecvError::{Disconnected, Empty}; use std::sync::mpsc::{Sender, channel}; use string_cache::Atom; +use style::context::ReflowGoal; use time; use timers::{ActiveTimers, IsInterval, ScheduledCallback, TimerCallback, TimerHandle}; use url::Url; diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index ec889087ec8..7c555efcca6 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -23,12 +23,11 @@ use std::any::Any; use std::sync::Arc; use std::sync::mpsc::{Receiver, Sender, channel}; use string_cache::Atom; +use style::context::ReflowGoal; use style::stylesheets::Stylesheet; use url::Url; use util::ipc::OptionalOpaqueIpcSender; -pub use style::animation::Animation; -pub use style::context::ReflowGoal; pub use dom::node::TrustedNodeAddress; /// Asynchronous messages that script can send to layout. diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index f0ed7ac22d6..26452be569b 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -59,7 +59,7 @@ use js::jsapi::{JSObject, SetPreserveWrapperCallback}; use js::jsval::UndefinedValue; use js::rust::Runtime; use layout_interface::{ReflowQueryType}; -use layout_interface::{self, LayoutChan, NewLayoutThreadInfo, ReflowGoal, ScriptLayoutChan}; +use layout_interface::{self, LayoutChan, NewLayoutThreadInfo, ScriptLayoutChan}; use libc; use mem::heap_size_of_self_and_children; use msg::constellation_msg::{ConstellationChan, LoadData}; @@ -97,6 +97,7 @@ use std::result::Result; use std::sync::atomic::{Ordering, AtomicBool}; use std::sync::mpsc::{Receiver, Select, Sender, channel}; use std::sync::{Arc, Mutex}; +use style::context::ReflowGoal; use time::{Tm, now}; use url::Url; use util::opts;