diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs index 8e9e5340420..c108bbcc75f 100644 --- a/components/style/properties/longhands/inherited_text.mako.rs +++ b/components/style/properties/longhands/inherited_text.mako.rs @@ -109,8 +109,6 @@ ${helpers.predefined_type( extra_specified="${'distribute' if engine == 'gecko' else ''}" gecko_enum_prefix="StyleTextJustify" animation_value_type="discrete" - gecko_pref="layout.css.text-justify.enabled" - has_effect_on_gecko_scrollbars="False" spec="https://drafts.csswg.org/css-text/#propdef-text-justify" servo_restyle_damage="rebuild_and_reflow" > @@ -385,8 +383,6 @@ ${helpers.predefined_type( "computed::LengthPercentageOrAuto::auto()", engines="gecko", animation_value_type="ComputedValue", - gecko_pref="layout.css.text-underline-offset.enabled", - has_effect_on_gecko_scrollbars=False, spec="https://drafts.csswg.org/css-text-decor-4/#underline-offset", )} @@ -397,8 +393,6 @@ ${helpers.predefined_type( "computed::TextUnderlinePosition::AUTO", engines="gecko", animation_value_type="discrete", - gecko_pref="layout.css.text-underline-position.enabled", - has_effect_on_gecko_scrollbars=False, spec="https://drafts.csswg.org/css-text-decor-3/#text-underline-position-property", )} @@ -410,7 +404,5 @@ ${helpers.predefined_type( engines="gecko", needs_context=False, animation_value_type="discrete", - gecko_pref="layout.css.text-decoration-skip-ink.enabled", - has_effect_on_gecko_scrollbars=False, spec="https://drafts.csswg.org/css-text-decor-4/#text-decoration-skip-ink-property", )} diff --git a/components/style/properties/longhands/text.mako.rs b/components/style/properties/longhands/text.mako.rs index 1912bc28e3b..1660ed5c58e 100644 --- a/components/style/properties/longhands/text.mako.rs +++ b/components/style/properties/longhands/text.mako.rs @@ -75,6 +75,5 @@ ${helpers.predefined_type( engines="gecko", initial_specified_value="generics::text::GenericTextDecorationLength::Auto", animation_value_type="ComputedValue", - gecko_pref="layout.css.text-decoration-thickness.enabled", spec="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property" )} diff --git a/components/style/properties/shorthands/text.mako.rs b/components/style/properties/shorthands/text.mako.rs index 5c7d9c7655c..03637d557e5 100644 --- a/components/style/properties/shorthands/text.mako.rs +++ b/components/style/properties/shorthands/text.mako.rs @@ -10,11 +10,9 @@ sub_properties="text-decoration-line ${' text-decoration-style text-decoration-color text-decoration-thickness' if engine == 'gecko' else ''}" spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration"> - % if engine == "gecko": use crate::values::specified; use crate::properties::longhands::{text_decoration_style, text_decoration_color, text_decoration_thickness}; - use crate::properties::{PropertyId, LonghandId}; % endif use crate::properties::longhands::text_decoration_line; @@ -23,9 +21,6 @@ input: &mut Parser<'i, 't>, ) -> Result> { % if engine == "gecko": - let text_decoration_thickness_enabled = - PropertyId::Longhand(LonghandId::TextDecorationThickness).enabled_for_all_content(); - let (mut line, mut style, mut color, mut thickness, mut any) = (None, None, None, None, false); % else: let (mut line, mut any) = (None, false); @@ -49,9 +44,7 @@ % if engine == "gecko": parse_component!(style, text_decoration_style); parse_component!(color, text_decoration_color); - if text_decoration_thickness_enabled { - parse_component!(thickness, text_decoration_thickness); - } + parse_component!(thickness, text_decoration_thickness); % endif break; @@ -82,7 +75,7 @@ % if engine == "gecko": *self.text_decoration_style == text_decoration_style::SpecifiedValue::Solid, *self.text_decoration_color == specified::Color::CurrentColor, - self.text_decoration_thickness.map_or(true, |t| t.is_auto()) + self.text_decoration_thickness.is_auto() % else: true, true, true % endif