diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 8529ae941a9e..135946986800 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -632,7 +632,7 @@ bool nsImageFrame::ShouldCreateImageFrameFor(const Element& aElement, return true; } - if (aStyle.StyleUIReset()->mForceBrokenImageIcon) { + if (aStyle.StyleUIReset()->mMozForceBrokenImageIcon) { return true; } diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 1c31bbeb2cba..4ecc55d1fda9 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -3185,7 +3185,7 @@ nsChangeHint nsStyleUI::CalcDifference(const nsStyleUI& aNewData) const { nsStyleUIReset::nsStyleUIReset(const Document& aDocument) : mUserSelect(StyleUserSelect::Auto), mScrollbarWidth(StyleScrollbarWidth::Auto), - mForceBrokenImageIcon(0), + mMozForceBrokenImageIcon(0), mIMEMode(StyleImeMode::Auto), mWindowDragging(StyleWindowDragging::Default), mWindowShadow(StyleWindowShadow::Default), @@ -3199,7 +3199,7 @@ nsStyleUIReset::nsStyleUIReset(const Document& aDocument) nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource) : mUserSelect(aSource.mUserSelect), mScrollbarWidth(aSource.mScrollbarWidth), - mForceBrokenImageIcon(aSource.mForceBrokenImageIcon), + mMozForceBrokenImageIcon(aSource.mMozForceBrokenImageIcon), mIMEMode(aSource.mIMEMode), mWindowDragging(aSource.mWindowDragging), mWindowShadow(aSource.mWindowShadow), @@ -3215,7 +3215,7 @@ nsChangeHint nsStyleUIReset::CalcDifference( const nsStyleUIReset& aNewData) const { nsChangeHint hint = nsChangeHint(0); - if (mForceBrokenImageIcon != aNewData.mForceBrokenImageIcon) { + if (mMozForceBrokenImageIcon != aNewData.mMozForceBrokenImageIcon) { hint |= nsChangeHint_ReconstructFrame; } if (mScrollbarWidth != aNewData.mScrollbarWidth) { diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 0f5d8686ceb7..be3f818e8b4a 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -1618,7 +1618,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset { mozilla::StyleUserSelect mUserSelect; // [reset](selection-style) mozilla::StyleScrollbarWidth mScrollbarWidth; - uint8_t mForceBrokenImageIcon; // (0 if not forcing, otherwise forcing) + uint8_t mMozForceBrokenImageIcon; // (0 if not forcing, otherwise forcing) mozilla::StyleImeMode mIMEMode; mozilla::StyleWindowDragging mWindowDragging; mozilla::StyleWindowShadow mWindowShadow; diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs index 906cc75ad1e3..6286b81d0095 100644 --- a/servo/components/style/properties/gecko.mako.rs +++ b/servo/components/style/properties/gecko.mako.rs @@ -536,12 +536,7 @@ impl Clone for ${style_struct.gecko_struct_name} { -<%def name="impl_simple_type_with_conversion(ident, gecko_ffi_name=None)"> - <% - if gecko_ffi_name is None: - gecko_ffi_name = "m" + to_camel_case(ident) - %> - +<%def name="impl_simple_type_with_conversion(ident, gecko_ffi_name)"> #[allow(non_snake_case)] pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) { self.gecko.${gecko_ffi_name} = From::from(v) @@ -806,11 +801,10 @@ fn static_assert() { <% skip_position_longhands = " ".join(x.ident for x in SIDES) %> <%self:impl_trait style_struct_name="Position" - skip_longhands="${skip_position_longhands} grid-auto-flow"> + skip_longhands="${skip_position_longhands}"> % for side in SIDES: <% impl_split_style_coord(side.ident, "mOffset", side.index) %> % endfor - ${impl_simple_type_with_conversion("grid_auto_flow")} pub fn set_computed_justify_items(&mut self, v: values::specified::JustifyItems) { debug_assert_ne!(v.0, crate::values::specified::align::AlignFlags::LEGACY); self.gecko.mJustifyItems.computed = v; @@ -861,15 +855,13 @@ fn static_assert() { } -<% - skip_font_longhands = """font-family font-size font-size-adjust font-weight - font-style font-stretch -moz-script-level - font-synthesis -x-lang font-variant-alternates - font-variant-east-asian font-variant-ligatures - font-variant-numeric font-language-override - font-feature-settings font-variation-settings - -moz-min-font-size-ratio -x-text-zoom""" -%> +<% skip_font_longhands = """font-family font-size font-size-adjust font-weight + font-style font-stretch font-synthesis -x-lang + font-variant-alternates font-variant-east-asian + font-variant-ligatures font-variant-numeric + font-language-override font-feature-settings + font-variation-settings -moz-min-font-size-ratio + -x-text-zoom""" %> <%self:impl_trait style_struct_name="Font" skip_longhands="${skip_font_longhands}"> @@ -1131,9 +1123,7 @@ fn static_assert() { longhands::_x_text_zoom::computed_value::T(self.gecko.mAllowZoom) } - ${impl_simple("_moz_script_level", "mScriptLevel")} <% impl_simple_type_with_conversion("font_language_override", "mFont.languageOverride") %> - ${impl_simple_type_with_conversion("font_variant_ligatures", "mFont.variantLigatures")} ${impl_simple_type_with_conversion("font_variant_east_asian", "mFont.variantEastAsian")} ${impl_simple_type_with_conversion("font_variant_numeric", "mFont.variantNumeric")} @@ -1257,9 +1247,6 @@ fn static_assert() { ${impl_copy_animation_or_transition_value('animation', ident, gecko_ffi_name)} -<%def name="impl_transition_timing_function()"> - ${impl_animation_or_transition_timing_function('transition')} - <%def name="impl_animation_count(ident, gecko_ffi_name)"> ${impl_animation_or_transition_count('animation', ident, gecko_ffi_name)} @@ -1269,10 +1256,6 @@ fn static_assert() { ${impl_animation_or_transition_time_value('animation', ident, gecko_ffi_name)} -<%def name="impl_animation_timing_function()"> - ${impl_animation_or_transition_timing_function('animation')} - - <%def name="impl_animation_keyword(ident, gecko_ffi_name, keyword, cast_type='u8')"> #[allow(non_snake_case)] pub fn set_animation_${ident}(&mut self, v: I) @@ -1365,7 +1348,7 @@ fn static_assert() { ${impl_transition_time_value('delay', 'Delay')} ${impl_transition_time_value('duration', 'Duration')} - ${impl_transition_timing_function()} + ${impl_animation_or_transition_timing_function('transition')} pub fn transition_combined_duration_at(&self, index: usize) -> f32 { // https://drafts.csswg.org/css-transitions/#transition-combined-duration @@ -1579,8 +1562,7 @@ fn static_assert() { ${impl_animation_count('iteration_count', 'IterationCount')} ${impl_copy_animation_value('iteration_count', 'IterationCount')} - - ${impl_animation_timing_function()} + ${impl_animation_or_transition_timing_function('animation')} #[allow(non_snake_case)] pub fn set__webkit_line_clamp(&mut self, v: longhands::_webkit_line_clamp::computed_value::T) { @@ -2034,15 +2016,13 @@ fn static_assert() { <%self:impl_trait style_struct_name="InheritedText" - skip_longhands="text-align -webkit-text-stroke-width text-emphasis-position"> + skip_longhands="text-align -webkit-text-stroke-width"> <% text_align_keyword = Keyword("text-align", "start end left right center justify -moz-center -moz-left -moz-right char", gecko_strip_moz_prefix=False) %> ${impl_keyword('text_align', 'mTextAlign', text_align_keyword)} - ${impl_simple_type_with_conversion("text_emphasis_position")} - ${impl_non_negative_length('_webkit_text_stroke_width', 'mWebkitTextStrokeWidth')} @@ -2145,8 +2125,7 @@ mask-mode mask-repeat mask-clip mask-origin mask-composite mask-position-x mask- } -<%self:impl_trait style_struct_name="UI" skip_longhands="-moz-force-broken-image-icon"> - ${impl_simple_type_with_conversion("_moz_force_broken_image_icon", "mForceBrokenImageIcon")} +<%self:impl_trait style_struct_name="UI"> <%self:impl_trait style_struct_name="XUL">