Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: WTF I was thinking about when I wrote that?

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-06-23 00:46:29 +02:00
parent 33f581883b
commit 2b2e58a868
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/layout/animation.rs
View file

@ -139,7 +139,6 @@ pub fn recalc_style_for_animations(context: &SharedLayoutContext,
animation, animation,
&mut fragment.style, &mut fragment.style,
Some(&mut damage)); Some(&mut damage));
animation.increment_keyframe_if_applicable();
} }
} }
} }

10
components/style/animation.rs
View file

@ -66,9 +66,11 @@ impl KeyframesAnimationState {
/// ///
/// Returns true if the animation should keep running. /// Returns true if the animation should keep running.
pub fn tick(&mut self) -> bool { pub fn tick(&mut self) -> bool {
debug!("KeyframesAnimationState::tick");
let still_running = match self.iteration_state { let still_running = match self.iteration_state {
KeyframesIterationState::Finite(ref mut current, ref max) => { KeyframesIterationState::Finite(ref mut current, ref max) => {
*current += 1; *current += 1;
debug!("KeyframesAnimationState::tick: current={}, max={}", current, max);
*current < *max *current < *max
} }
KeyframesIterationState::Infinite => true, KeyframesIterationState::Infinite => true,
@ -120,14 +122,6 @@ impl Animation {
Animation::Keyframes(_, _, ref state) => state.paused, Animation::Keyframes(_, _, ref state) => state.paused,
} }
} }
pub fn increment_keyframe_if_applicable(&mut self) {
if let Animation::Keyframes(_, _, ref mut state) = *self {
if let KeyframesIterationState::Finite(ref mut iterations, _) = state.iteration_state {
*iterations += 1;
}
}
}
} }