diff options
Diffstat (limited to 'components/layout/animation.rs')
| -rw-r--r-- | components/layout/animation.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/components/layout/animation.rs b/components/layout/animation.rs index 8f0ac53bd45..4087479ed47 100644 --- a/components/layout/animation.rs +++ b/components/layout/animation.rs @@ -14,17 +14,16 @@ use script_traits::{AnimationState, LayoutMsg as ConstellationMsg}; use std::collections::HashMap; use std::sync::mpsc::Receiver; use style::animation::{Animation, update_style_for_animation}; -use style::selector_impl::{SelectorImplExt, ServoSelectorImpl}; use time; /// Processes any new animations that were discovered after style recalculation. /// Also expire any old animations that have completed, inserting them into /// `expired_animations`. -pub fn update_animation_state<Impl: SelectorImplExt>(constellation_chan: &IpcSender<ConstellationMsg>, - running_animations: &mut HashMap<OpaqueNode, Vec<Animation<Impl>>>, - expired_animations: &mut HashMap<OpaqueNode, Vec<Animation<Impl>>>, - new_animations_receiver: &Receiver<Animation<Impl>>, - pipeline_id: PipelineId) { +pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>, + running_animations: &mut HashMap<OpaqueNode, Vec<Animation>>, + expired_animations: &mut HashMap<OpaqueNode, Vec<Animation>>, + new_animations_receiver: &Receiver<Animation>, + pipeline_id: PipelineId) { let mut new_running_animations = vec![]; while let Ok(animation) = new_animations_receiver.try_recv() { let mut should_push = true; @@ -125,7 +124,7 @@ pub fn update_animation_state<Impl: SelectorImplExt>(constellation_chan: &IpcSen pub fn recalc_style_for_animations(context: &SharedLayoutContext, flow: &mut Flow, animations: &HashMap<OpaqueNode, - Vec<Animation<ServoSelectorImpl>>>) { + Vec<Animation>>) { let mut damage = RestyleDamage::empty(); flow.mutate_fragments(&mut |fragment| { if let Some(ref animations) = animations.get(&fragment.node) { |