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 668d08e2c85..0a174a02d48 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -45,7 +45,6 @@ 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::{ScriptLayoutChan, ScriptReflow}; @@ -63,6 +62,7 @@ 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::dom::{TDocument, TElement, TNode}; diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 9d407c4e8b2..3a081f6a0e3 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -28,7 +28,6 @@ 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;