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

Bug 1328787 - Part 9: Set Keyframe.mPropertyValues for the case where keyframe is specified. r=heycam

Browse source 
MozReview-Commit-ID: Ayt7IsYShl4
This commit is contained in:
Hiroyuki Ikezoe 2017-01-28 18:57:27 +09:00
parent e20a3ad9b5
commit aa6372d99d
4 changed files with 75 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -737,16 +737,6 @@ enum StaticId {
Shorthand(ShorthandId),
}
include!(concat!(env!("OUT_DIR"), "/static_ids.rs"));
<%
def alias_to_nscsspropertyid(alias):
if alias == "word-wrap":
return "nsCSSPropertyID_eCSSPropertyAlias_WordWrap"
return "nsCSSPropertyID::eCSSPropertyAlias_%s" % to_camel_case(alias)
def to_nscsspropertyid(ident):
if ident == "float":
ident = "float_"
return "nsCSSPropertyID::eCSSProperty_%s" % ident
%>
impl PropertyId {
/// Returns a given property from the string `s`.
///
@ -771,21 +761,21 @@ impl PropertyId {
use gecko_bindings::structs::*;
match id {
% for property in data.longhands:
${to_nscsspropertyid(property.ident)} => {
${helpers.to_nscsspropertyid(property.ident)} => {
Ok(PropertyId::Longhand(LonghandId::${property.camel_case}))
}
% for alias in property.alias:
${alias_to_nscsspropertyid(alias)} => {
${helpers.alias_to_nscsspropertyid(alias)} => {
Ok(PropertyId::Longhand(LonghandId::${property.camel_case}))
}
% endfor
% endfor
% for property in data.shorthands:
${to_nscsspropertyid(property.ident)} => {
${helpers.to_nscsspropertyid(property.ident)} => {
Ok(PropertyId::Shorthand(ShorthandId::${property.camel_case}))
}
% for alias in property.alias:
${alias_to_nscsspropertyid(alias)} => {
${helpers.alias_to_nscsspropertyid(alias)} => {
Ok(PropertyId::Shorthand(ShorthandId::${property.camel_case}))
}
% endfor
@ -804,14 +794,14 @@ impl PropertyId {
PropertyId::Longhand(id) => match id {
% for property in data.longhands:
LonghandId::${property.camel_case} => {
Ok(${to_nscsspropertyid(property.ident)})
Ok(${helpers.to_nscsspropertyid(property.ident)})
}
% endfor
},
PropertyId::Shorthand(id) => match id {
% for property in data.shorthands:
ShorthandId::${property.camel_case} => {
Ok(${to_nscsspropertyid(property.ident)})
Ok(${helpers.to_nscsspropertyid(property.ident)})
}
% endfor
},
@ -921,7 +911,7 @@ impl ToCss for PropertyDeclaration {
pref_ident = "float_"
%>
if structs::root::mozilla::SERVO_PREF_ENABLED_${pref_ident} {
let id = structs::${to_nscsspropertyid(property.ident)};
let id = structs::${helpers.to_nscsspropertyid(property.ident)};
let enabled = unsafe { bindings::Gecko_PropertyId_IsPrefEnabled(id) };
if !enabled {
return PropertyDeclarationParseResult::ExperimentalProperty