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

Fix serialization of animation.

Browse source
This commit is contained in:
Michael Nelson 2017-02-14 20:38:02 +11:00
parent 9702d6920a
commit 75a993ce0c
2 changed files with 136 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

59
components/style/properties/shorthand/box.mako.rs
View file

@ -308,28 +308,55 @@ macro_rules! try_parse_one {
impl<'a> LonghandsToSerialize<'a> {
fn to_css_declared<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
try!(self.animation_duration.to_css(dest));
try!(write!(dest, " "));
fn extract_value<T>(x: &DeclaredValue<T>) -> Option< &T> {
match *x {
DeclaredValue::Value(ref val) => Some(val),
_ => None,
}
}
try!(self.animation_timing_function.to_css(dest));
try!(write!(dest, " "));
// TODO: When the lengths are different, shorthand shouldn't be serialized
// at all.
use std::cmp;
let mut len = 0;
% for name in "duration timing_function delay direction fill_mode iteration_count play_state name".split():
len = cmp::max(len, extract_value(self.animation_${name}).map(|i| i.0.len())
.unwrap_or(0));
% endfor
try!(self.animation_delay.to_css(dest));
try!(write!(dest, " "));
// There should be at least one declared value
if len == 0 {
return dest.write_str("")
}
try!(self.animation_direction.to_css(dest));
try!(write!(dest, " "));
let mut first = true;
for i in 0..len {
% for name in "duration timing_function delay direction fill_mode iteration_count play_state name".split():
let ${name} = if let DeclaredValue::Value(ref arr) = *self.animation_${name} {
arr.0.get(i % arr.0.len())
} else {
None
};
% endfor
try!(self.animation_fill_mode.to_css(dest));
try!(write!(dest, " "));
if first {
first = false;
} else {
try!(write!(dest, ", "));
}
try!(self.animation_iteration_count.to_css(dest));
try!(write!(dest, " "));
% for name in "duration timing_function delay direction fill_mode iteration_count play_state".split():
if let Some(${name}) = ${name} {
try!(${name}.to_css(dest));
try!(write!(dest, " "));
}
% endfor
try!(self.animation_play_state.to_css(dest));
try!(write!(dest, " "));
self.animation_name.to_css(dest)
if let Some(name) = name {
try!(name.to_css(dest));
}
}
Ok(())
}
}
</%helpers:shorthand>