mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Animation shorthand should be serialized only when the value lists have the same length.
Fixes #15398 The previous commit did most of the work here of updating the algorithm to skip shorthands if a shorthand value was an empty string. This commit just updates animations LonghandToSerialize's implementation of to_css_declared to write an empty string value if the list lengths differ (and updates the test to match).
This commit is contained in:
parent
a0998d30d4
commit
bcafe21dc9
4 changed files with 40 additions and 46 deletions
|
@ -344,23 +344,21 @@ impl ToCss for PropertyDeclarationBlock {
|
|||
|
||||
// Substep 5 - Let value be the result of invoking serialize a CSS
|
||||
// value of current longhands.
|
||||
let mut value = String::from("");
|
||||
let mut value = String::new();
|
||||
match shorthand.get_shorthand_appendable_value(current_longhands.iter().cloned()) {
|
||||
None => continue,
|
||||
Some(appendable_value) => {
|
||||
// Also demo test of overflow with important - I think it'll not
|
||||
// be correct.
|
||||
try!(append_declaration_value(&mut value, appendable_value));
|
||||
}
|
||||
}
|
||||
|
||||
// Substep 6
|
||||
if value == "" {
|
||||
if value.is_empty() {
|
||||
continue
|
||||
}
|
||||
|
||||
// Substeps 7 and 8
|
||||
try!(append_serialization::<W, Cloned<slice::Iter< &PropertyDeclaration>>, _>(
|
||||
try!(append_serialization::<W, Cloned<slice::Iter< _>>, _>(
|
||||
dest, &shorthand, AppendableValue::Css(&value), importance,
|
||||
&mut is_first_serialization));
|
||||
|
||||
|
@ -417,7 +415,8 @@ pub enum AppendableValue<'a, I>
|
|||
/// FIXME: This needs more docs, where are the shorthands expanded? We print
|
||||
/// the property name before-hand, don't we?
|
||||
DeclarationsForShorthand(ShorthandId, I),
|
||||
/// A raw CSS string, coming for example from a property with CSS variables.
|
||||
/// A raw CSS string, coming for example from a property with CSS variables,
|
||||
/// or when storing a serialized shorthand value before appending directly.
|
||||
Css(&'a str)
|
||||
}
|
||||
|
||||
|
@ -444,7 +443,6 @@ pub fn append_declaration_value<'a, W, I>(dest: &mut W,
|
|||
I: Iterator<Item=&'a PropertyDeclaration>,
|
||||
{
|
||||
match appendable_value {
|
||||
// Should be able to use this enum to pass the already serialized css?
|
||||
AppendableValue::Css(css) => {
|
||||
try!(write!(dest, "{}", css))
|
||||
},
|
||||
|
@ -485,8 +483,10 @@ pub fn append_serialization<'a, W, I, N>(dest: &mut W,
|
|||
// for normal parsed values, add a space between key: and value
|
||||
try!(write!(dest, " "));
|
||||
}
|
||||
},
|
||||
&AppendableValue::DeclarationsForShorthand(..) => try!(write!(dest, " "))
|
||||
},
|
||||
// Currently append_serialization is only called with a Css or
|
||||
// a Declaration AppendableValue.
|
||||
&AppendableValue::DeclarationsForShorthand(..) => unreachable!()
|
||||
}
|
||||
|
||||
try!(append_declaration_value(dest, appendable_value));
|
||||
|
|
|
@ -549,7 +549,7 @@ impl ShorthandId {
|
|||
}
|
||||
}
|
||||
|
||||
/// Find an return an appendable value for the given declarations.
|
||||
/// Finds and returns an appendable value for the given declarations.
|
||||
///
|
||||
/// Returns the optional appendable value.
|
||||
pub fn get_shorthand_appendable_value<'a, I>(self,
|
||||
|
|
|
@ -279,27 +279,27 @@ macro_rules! try_parse_one {
|
|||
}
|
||||
}
|
||||
|
||||
// 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
|
||||
|
||||
let len = extract_value(self.animation_name).map(|i| i.0.len()).unwrap_or(0);
|
||||
// There should be at least one declared value
|
||||
if len == 0 {
|
||||
return dest.write_str("")
|
||||
}
|
||||
|
||||
// If any value list length is differs then we don't do a shorthand serialization
|
||||
// either.
|
||||
% for name in "duration timing_function delay direction fill_mode iteration_count play_state".split():
|
||||
if len != extract_value(self.animation_${name}).map(|i| i.0.len()).unwrap_or(0) {
|
||||
return dest.write_str("")
|
||||
}
|
||||
% endfor
|
||||
|
||||
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())
|
||||
&arr.0[i]
|
||||
} else {
|
||||
None
|
||||
unreachable!()
|
||||
};
|
||||
% endfor
|
||||
|
||||
|
@ -310,15 +310,11 @@ macro_rules! try_parse_one {
|
|||
}
|
||||
|
||||
% 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, " "));
|
||||
}
|
||||
try!(${name}.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
% endfor
|
||||
|
||||
if let Some(name) = name {
|
||||
try!(name.to_css(dest));
|
||||
}
|
||||
try!(name.to_css(dest));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue