From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../style/properties/longhands/list.mako.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'servo/components/style/properties/longhands/list.mako.rs') diff --git a/servo/components/style/properties/longhands/list.mako.rs b/servo/components/style/properties/longhands/list.mako.rs index 619724bd32..0a3f8e36ec 100644 --- a/servo/components/style/properties/longhands/list.mako.rs +++ b/servo/components/style/properties/longhands/list.mako.rs @@ -4,13 +4,11 @@ <%namespace name="helpers" file="/helpers.mako.rs" /> -<% data.new_style_struct("List", inherited=True) %> - ${helpers.single_keyword( "list-style-position", "outside inside", - engines="gecko servo-2013 servo-2020", - servo_2020_pref="layout.2020.unimplemented", + engines="gecko servo", + servo_pref="layout.legacy_layout", gecko_enum_prefix="StyleListStylePosition", animation_value_type="discrete", spec="https://drafts.csswg.org/css-lists/#propdef-list-style-position", @@ -24,17 +22,16 @@ ${helpers.single_keyword( // upper-roman // // [1]: http://dev.w3.org/csswg/css-counter-styles/ -% if engine in ["servo-2013", "servo-2020"]: +% if engine == "servo": ${helpers.single_keyword( "list-style-type", - "disc none circle square disclosure-open disclosure-closed", - extra_servo_2013_values=""" + """disc none circle square disclosure-open disclosure-closed decimal lower-alpha upper-alpha arabic-indic bengali cambodian cjk-decimal devanagari gujarati gurmukhi kannada khmer lao malayalam mongolian myanmar oriya persian telugu thai tibetan cjk-earthly-branch cjk-heavenly-stem lower-greek hiragana hiragana-iroha katakana katakana-iroha """, - engines="servo-2013 servo-2020", + engines="servo", animation_value_type="discrete", spec="https://drafts.csswg.org/css-lists/#propdef-list-style-type", servo_restyle_damage="rebuild_and_reflow", @@ -59,11 +56,12 @@ ${helpers.single_keyword( ${helpers.predefined_type( "list-style-image", "Image", - engines="gecko servo-2013 servo-2020", + engines="gecko servo", initial_value="computed::Image::None", initial_specified_value="specified::Image::None", animation_value_type="discrete", spec="https://drafts.csswg.org/css-lists/#propdef-list-style-image", + boxed=engine == "servo", servo_restyle_damage="rebuild_and_reflow", affects="layout", )} @@ -72,7 +70,8 @@ ${helpers.predefined_type( "quotes", "Quotes", "computed::Quotes::get_initial_value()", - engines="gecko servo-2013", + engines="gecko servo", + servo_pref="layout.legacy_layout", animation_value_type="discrete", spec="https://drafts.csswg.org/css-content/#propdef-quotes", servo_restyle_damage="rebuild_and_reflow", -- cgit v1.2.3