diff options
| -rw-r--r-- | components/style/properties/gecko.mako.rs | 4 | ||||
| -rw-r--r-- | components/style/properties/longhands/box.mako.rs | 5 | ||||
| -rw-r--r-- | components/style/properties/longhands/inherited_text.mako.rs | 2 | ||||
| -rw-r--r-- | components/style/values/specified/mod.rs | 11 |
4 files changed, 6 insertions, 16 deletions
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index afef80aa800..f00e5aafced 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -1825,7 +1825,7 @@ fn static_assert() { for (gecko, servo) in self.gecko.mAnimations.iter_mut().take(input_len as usize).zip(v) { let result = match servo { - % for value in keyword.gecko_values(): + % for value in keyword.values_for("gecko"): Keyword::${to_camel_case(value)} => structs::${keyword.gecko_constant(value)} ${keyword.maybe_cast(cast_type)}, % endfor @@ -1838,7 +1838,7 @@ fn static_assert() { -> longhands::animation_${ident}::computed_value::SingleComputedValue { use crate::properties::longhands::animation_${ident}::single_value::computed_value::T as Keyword; match self.gecko.mAnimations[index].m${gecko_ffi_name} ${keyword.maybe_cast("u32")} { - % for value in keyword.gecko_values(): + % for value in keyword.values_for("gecko"): structs::${keyword.gecko_constant(value)} => Keyword::${to_camel_case(value)}, % endfor % if keyword.gecko_inexhaustive: diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs index 3244b181709..40075a65084 100644 --- a/components/style/properties/longhands/box.mako.rs +++ b/components/style/properties/longhands/box.mako.rs @@ -649,9 +649,10 @@ ${helpers.predefined_type( // The spec issue for the parse_method: https://github.com/w3c/csswg-drafts/issues/4102. ${helpers.predefined_type( - "shape-image-threshold", "Opacity", "0.0", + "shape-image-threshold", + "Opacity", + "0.0", engines="gecko", - parse_method="parse_number", animation_value_type="ComputedValue", spec="https://drafts.csswg.org/css-shapes/#shape-image-threshold-property", )} diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs index 9887bf15c3b..01e84cee2ec 100644 --- a/components/style/properties/longhands/inherited_text.mako.rs +++ b/components/style/properties/longhands/inherited_text.mako.rs @@ -80,7 +80,7 @@ ${helpers.predefined_type( "overflow-wrap", "OverflowWrap", "computed::OverflowWrap::Normal", - engines="servo-2013 servo-2020", + engines="gecko servo-2013 servo-2020", servo_2020_pref="layout.2020.unimplemented", animation_value_type="discrete", spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap", diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs index c8cce337381..f33a191c277 100644 --- a/components/style/values/specified/mod.rs +++ b/components/style/values/specified/mod.rs @@ -410,17 +410,6 @@ impl Parse for NonNegativeNumberOrPercentage { )] pub struct Opacity(Number); -impl Opacity { - /// Parse number value only. - #[inline] - pub fn parse_number<'i, 't>( - context: &ParserContext, - input: &mut Parser<'i, 't>, - ) -> Result<Self, ParseError<'i>> { - Number::parse(context, input).map(Opacity) - } -} - impl Parse for Opacity { /// Opacity accepts <number> | <percentage>, so we parse it as NumberOrPercentage, /// and then convert into an Number if it's a Percentage. |