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

Serialize 'initial' as "initial", not as the inital value.

Browse source
This commit is contained in:
Simon Sapin 2015-02-06 08:52:59 +11:00
parent 149053c2a7
commit 00e7b56244
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/properties.mako.rs
View file

@ -2449,11 +2449,11 @@ pub enum DeclaredValue<T> {
}
impl<T: Show> DeclaredValue<T> {
pub fn specified_value(&self) -> Option<String> {
pub fn specified_value(&self) -> String {
match self {
&DeclaredValue::SpecifiedValue(ref inner) => Some(format!("{:?}", inner)),
&DeclaredValue::Initial => None,
&DeclaredValue::Inherit => Some("inherit".to_owned()),
&DeclaredValue::SpecifiedValue(ref inner) => format!("{:?}", inner),
&DeclaredValue::Initial => "initial".to_owned(),
&DeclaredValue::Inherit => "inherit".to_owned(),
}
}
}
@ -2491,8 +2491,7 @@ impl PropertyDeclaration {
% for property in LONGHANDS:
% if property.derived_from is None:
&PropertyDeclaration::${property.camel_case}(ref value) =>
value.specified_value()
.unwrap_or_else(|| format!("{:?}", longhands::${property.ident}::get_initial_value())),
value.specified_value(),
% endif
% endfor
decl => panic!("unsupported property declaration: {:?}", decl.name()),