diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index bd5740ecbbc..e74f1ef9990 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -984,7 +984,7 @@ fn static_assert() { ${impl_simple_copy('_moz_min_font_size_ratio', 'mMinFontSizeRatio')} -<%def name="impl_copy_animation_or_transition_value(type, ident, gecko_ffi_name, member=None)"> +<%def name="impl_copy_animation_or_transition_value(type, ident, gecko_ffi_name)"> #[allow(non_snake_case)] pub fn copy_${type}_${ident}_from(&mut self, other: &Self) { self.gecko.m${type.capitalize()}s.ensure_len(other.gecko.m${type.capitalize()}s.len()); @@ -997,11 +997,7 @@ fn static_assert() { ); for (ours, others) in iter { - % if member: - ours.m${gecko_ffi_name}.${member} = others.m${gecko_ffi_name}.${member}.clone(); - % else: ours.m${gecko_ffi_name} = others.m${gecko_ffi_name}.clone(); - % endif } } @@ -1056,14 +1052,14 @@ fn static_assert() { self.gecko.m${type.capitalize()}TimingFunctionCount = input_len as u32; for (gecko, servo) in self.gecko.m${type.capitalize()}s.iter_mut().take(input_len as usize).zip(v) { - gecko.mTimingFunction.mTiming = servo; + gecko.mTimingFunction = servo; } } ${impl_animation_or_transition_count(type, 'timing_function', 'TimingFunction')} - ${impl_copy_animation_or_transition_value(type, 'timing_function', "TimingFunction", "mTiming")} + ${impl_copy_animation_or_transition_value(type, 'timing_function', "TimingFunction")} pub fn ${type}_timing_function_at(&self, index: usize) -> longhands::${type}_timing_function::computed_value::SingleComputedValue { - self.gecko.m${type.capitalize()}s[index].mTimingFunction.mTiming.clone() + self.gecko.m${type.capitalize()}s[index].mTimingFunction.clone() }