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

layout: Make animations work... more or less.

Browse source 
There's some maths I've done wrong, but it DOES animate some things, though
they're only triggered past the first restyle, and we probably have some
duplications where the animations arrive to layout.

Anyway, got to go.
This commit is contained in:
Emilio Cobos Álvarez 2016-06-20 17:30:43 +02:00
parent c16c5acade
commit bc970596d6
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 77 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/style/animation.rs
View file

@ -61,7 +61,30 @@ pub enum Animation {
Keyframes(OpaqueNode, Atom, KeyframesAnimationState),
}
/// A keyframes animation previously sent to layout.
impl Animation {
pub fn node(&self) -> &OpaqueNode {
match *self {
Animation::Transition(ref node, _, _) => node,
Animation::Keyframes(ref node, _, _) => node,
}
}
pub fn is_paused(&self) -> bool {
match *self {
Animation::Transition(..) => false,
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;
}
}
}
}
/// A single animation frame of a single property.
#[derive(Debug, Clone)]
@ -255,7 +278,8 @@ pub fn maybe_start_animations<Impl: SelectorImplExt>(context: &SharedStyleContex
continue
}
if let Some(ref animation) = context.stylist.animations().get(&name) {
if context.stylist.animations().get(&name).is_some() {
debug!("maybe_start_animations: animation {} found", name);
let delay = box_style.animation_delay.0.get_mod(i).seconds();
let animation_start = time::precise_time_s() + delay as f64;
let duration = box_style.animation_duration.0.get_mod(i).seconds();
@ -307,9 +331,11 @@ pub fn update_style_for_animation<Damage, Impl>(context: &SharedStyleContext<Imp
damage: Option<&mut Damage>)
where Impl: SelectorImplExt,
Damage: TRestyleDamage<ConcreteComputedValues = Impl::ComputedValues> {
debug!("update_style_for_animation: entering");
let now = time::precise_time_s();
match *animation {
Animation::Transition(_, start_time, ref frame) => {
debug!("update_style_for_animation: transition found");
let mut new_style = (*style).clone();
let updated_style = update_style_for_animation_frame(&mut new_style,
now, start_time,
@ -323,6 +349,7 @@ where Impl: SelectorImplExt,
}
}
Animation::Keyframes(_, ref name, ref state) => {
debug!("update_style_for_animation: animation found {:?}", name);
debug_assert!(!state.paused);
let duration = state.duration;
let started_at = state.started_at;
@ -369,8 +396,8 @@ where Impl: SelectorImplExt,
for i in 1..animation.steps.len() {
if total_progress as f32 <= animation.steps[i].start_percentage.0 {
// We might have found our current keyframe.
target_keyframe = Some(&animation.steps[i]);
last_keyframe = target_keyframe;
target_keyframe = Some(&animation.steps[i]);
}
}
@ -414,6 +441,7 @@ where Impl: SelectorImplExt,
let mut style_changed = false;
for transition_property in &animation.properties_changed {
debug!("update_style_for_animation: scanning prop {:?} for animation {}", transition_property, name);
if let Some(property_animation) = PropertyAnimation::from_transition_property(*transition_property,
timing_function,
Time(relative_duration as f32),
@ -426,6 +454,7 @@ where Impl: SelectorImplExt,
}
if style_changed {
debug!("update_style_for_animation: got style change in animation {:?}", name);
if let Some(damage) = damage {
*damage = *damage | Damage::compute(Some(style), &new_style);
}