aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/animation.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2016-07-19 20:29:22 +0200
committerSimon Sapin <simon.sapin@exyr.org>2016-07-20 08:42:40 +0200
commit789807b7b09e0742a197c98efd2f81b85b751a57 (patch)
treee093027760cf23719d9f6b3e279eab46e9b3168f /components/layout/animation.rs
parentb2a7e4437391abd92486d5bef879fadadabab162 (diff)
downloadservo-789807b7b09e0742a197c98efd2f81b85b751a57.tar.gz
servo-789807b7b09e0742a197c98efd2f81b85b751a57.zip
Remove the ComputedValue traits and style_struct_traits
Diffstat (limited to 'components/layout/animation.rs')
-rw-r--r--components/layout/animation.rs13
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) {