diff --git a/components/style/properties/data.py b/components/style/properties/data.py index f134a9765a8..97cc0cf629f 100644 --- a/components/style/properties/data.py +++ b/components/style/properties/data.py @@ -92,7 +92,7 @@ def arg_to_bool(arg): class Longhand(object): - def __init__(self, style_struct, name, spec=None, animatable=None, derived_from=None, keyword=None, + def __init__(self, style_struct, name, spec=None, animation_type=None, derived_from=None, keyword=None, predefined_type=None, custom_cascade=False, experimental=False, internal=False, need_clone=False, need_index=False, gecko_ffi_name=None, depend_on_viewport_size=False, allowed_in_keyframe_block=True, complex_color=False, cast_type='u8', @@ -134,9 +134,14 @@ class Longhand(object): # This is done like this since just a plain bool argument seemed like # really random. - if animatable is None: - raise TypeError("animatable should be specified for " + name + ")") - self.animatable = arg_to_bool(animatable) + if animation_type is None: + raise TypeError("animation_type should be specified for (" + name + ")") + animation_types = ["none", "normal", "discrete"] + if animation_type not in animation_types: + raise TypeError("animation_type should be one of (" + str(animation_types) + ")") + self.animation_type = animation_type + + self.animatable = animation_type != "none" if self.logical: # Logical properties don't animate separately self.animatable = False diff --git a/components/style/properties/longhand/background.mako.rs b/components/style/properties/longhand/background.mako.rs index b053be48fbd..8739ca7a356 100644 --- a/components/style/properties/longhand/background.mako.rs +++ b/components/style/properties/longhand/background.mako.rs @@ -10,9 +10,9 @@ ${helpers.predefined_type("background-color", "CSSColor", "::cssparser::Color::RGBA(::cssparser::RGBA::transparent())", initial_specified_value="SpecifiedValue::transparent()", spec="https://drafts.csswg.org/css-backgrounds/#background-color", - animatable=True, complex_color=True)} + animation_type="normal", complex_color=True)} -<%helpers:vector_longhand name="background-image" animatable="False" +<%helpers:vector_longhand name="background-image" animation_type="none" spec="https://drafts.csswg.org/css-backgrounds/#the-background-image" has_uncacheable_values="${product == 'gecko'}"> use std::fmt; @@ -89,7 +89,7 @@ ${helpers.predefined_type("background-color", "CSSColor", } -<%helpers:vector_longhand name="background-position-x" animatable="True" +<%helpers:vector_longhand name="background-position-x" animation_type="normal" spec="https://drafts.csswg.org/css-backgrounds-4/#propdef-background-position-x" delegate_animate="True"> use std::fmt; @@ -140,7 +140,7 @@ ${helpers.predefined_type("background-color", "CSSColor", } -<%helpers:vector_longhand name="background-position-y" animatable="True" +<%helpers:vector_longhand name="background-position-y" animation_type="normal" spec="https://drafts.csswg.org/css-backgrounds-4/#propdef-background-position-y" delegate_animate="True"> use std::fmt; @@ -192,7 +192,7 @@ ${helpers.predefined_type("background-color", "CSSColor", } -<%helpers:vector_longhand name="background-repeat" animatable="False" +<%helpers:vector_longhand name="background-repeat" animation_type="none" spec="https://drafts.csswg.org/css-backgrounds/#the-background-repeat"> use std::fmt; use style_traits::ToCss; @@ -308,22 +308,22 @@ ${helpers.single_keyword("background-attachment", "scroll fixed" + (" local" if product == "gecko" else ""), vector=True, spec="https://drafts.csswg.org/css-backgrounds/#the-background-attachment", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("background-clip", "border-box padding-box content-box", extra_gecko_values="text", vector=True, extra_prefixes="webkit", spec="https://drafts.csswg.org/css-backgrounds/#the-background-clip", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("background-origin", "padding-box border-box content-box", vector=True, extra_prefixes="webkit", spec="https://drafts.csswg.org/css-backgrounds/#the-background-origin", - animatable=False)} + animation_type="none")} -<%helpers:vector_longhand name="background-size" animatable="True" extra_prefixes="webkit" +<%helpers:vector_longhand name="background-size" animation_type="normal" extra_prefixes="webkit" spec="https://drafts.csswg.org/css-backgrounds/#the-background-size"> use cssparser::Token; use std::ascii::AsciiExt; @@ -512,5 +512,5 @@ ${helpers.single_keyword("background-blend-mode", """normal multiply screen overlay darken lighten color-dodge color-burn hard-light soft-light difference exclusion hue saturation color luminosity""", - vector=True, products="gecko", animatable=False, + vector=True, products="gecko", animation_type="none", spec="https://drafts.fxtf.org/compositing/#background-blend-mode")} diff --git a/components/style/properties/longhand/border.mako.rs b/components/style/properties/longhand/border.mako.rs index 2aa6f0fe4b7..8a468cb5fa7 100644 --- a/components/style/properties/longhand/border.mako.rs +++ b/components/style/properties/longhand/border.mako.rs @@ -20,7 +20,7 @@ "::cssparser::Color::CurrentColor", alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-color"), spec=maybe_logical_spec(side, "color"), - animatable=True, logical = side[1])} + animation_type="normal", logical = side[1])} % endfor % for side in ALL_SIDES: @@ -29,14 +29,14 @@ need_clone=True, alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-style"), spec=maybe_logical_spec(side, "style"), - animatable=False, logical = side[1])} + animation_type="none", logical = side[1])} % endfor ${helpers.gecko_keyword_conversion(Keyword('border-style', "none solid double dotted dashed hidden groove ridge inset outset"), type="::values::specified::BorderStyle")} % for side in ALL_SIDES: - <%helpers:longhand name="border-${side[0]}-width" boxed="True" animatable="True" logical="${side[1]}" + <%helpers:longhand name="border-${side[0]}-width" boxed="True" animation_type="normal" logical="${side[1]}" alias="${maybe_moz_logical_alias(product, side, '-moz-border-%s-width')}" spec="${maybe_logical_spec(side, 'width')}"> use app_units::Au; @@ -70,14 +70,14 @@ ${helpers.gecko_keyword_conversion(Keyword('border-style', "parse", extra_prefixes="webkit", spec="https://drafts.csswg.org/css-backgrounds/#border-%s-radius" % corner, boxed=True, - animatable=True)} + animation_type="normal")} % endfor ${helpers.single_keyword("box-decoration-break", "slice clone", gecko_enum_prefix="StyleBoxDecorationBreak", gecko_inexhaustive=True, spec="https://drafts.csswg.org/css-break/#propdef-box-decoration-break", - products="gecko", animatable=False)} + products="gecko", animation_type="none")} ${helpers.single_keyword("-moz-float-edge", "content-box margin-box", gecko_ffi_name="mFloatEdge", @@ -85,9 +85,9 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box", gecko_inexhaustive=True, products="gecko", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-float-edge)", - animatable=False)} + animation_type="none")} -<%helpers:longhand name="border-image-source" animatable="False" boxed="True" +<%helpers:longhand name="border-image-source" animation_type="none" boxed="True" spec="https://drafts.csswg.org/css-backgrounds/#border-image-source"> use std::fmt; use style_traits::ToCss; @@ -163,7 +163,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box", } -<%helpers:longhand name="border-image-outset" animatable="False" +<%helpers:longhand name="border-image-outset" animation_type="none" spec="https://drafts.csswg.org/css-backgrounds/#border-image-outset"> use std::fmt; use style_traits::ToCss; @@ -279,7 +279,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box", } -<%helpers:longhand name="border-image-repeat" animatable="False" +<%helpers:longhand name="border-image-repeat" animation_type="none" spec="https://drafts.csswg.org/css-backgrounds/#border-image-repeat"> use std::fmt; use style_traits::ToCss; @@ -357,7 +357,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box", } -<%helpers:longhand name="border-image-width" animatable="False" +<%helpers:longhand name="border-image-width" animation_type="none" spec="https://drafts.csswg.org/css-backgrounds/#border-image-width"> use std::fmt; use style_traits::ToCss; @@ -557,7 +557,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box", } -<%helpers:longhand name="border-image-slice" boxed="True" animatable="False" +<%helpers:longhand name="border-image-slice" boxed="True" animation_type="none" spec="https://drafts.csswg.org/css-backgrounds/#border-image-slice"> use std::fmt; use style_traits::ToCss; diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs index 3e9c64dcb5a..9ff28b6e6d7 100644 --- a/components/style/properties/longhand/box.mako.rs +++ b/components/style/properties/longhand/box.mako.rs @@ -12,7 +12,7 @@ // TODO(SimonSapin): don't parse `inline-table`, since we don't support it <%helpers:longhand name="display" need_clone="True" - animatable="False" + animation_type="none" custom_cascade="${product == 'servo'}" spec="https://drafts.csswg.org/css-display/#propdef-display"> <% @@ -100,13 +100,13 @@ ${helpers.single_keyword("-moz-top-layer", "none top", gecko_constant_prefix="NS_STYLE_TOP_LAYER", gecko_ffi_name="mTopLayer", need_clone=True, - products="gecko", animatable=False, internal=True, + products="gecko", animation_type="none", internal=True, spec="Internal (not web-exposed)")} ${helpers.single_keyword("position", "static absolute relative fixed", need_clone="True", extra_gecko_values="sticky", - animatable="False", + animation_type="none", creates_stacking_context="True", abspos_cb="True", spec="https://drafts.csswg.org/css-position/#position-property")} @@ -116,7 +116,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed", // https://drafts.csswg.org/css-logical-props/#float-clear extra_specified="inline-start inline-end" needs_conversion="True" - animatable="False" + animation_type="none" need_clone="True" gecko_enum_prefix="StyleFloat" gecko_inexhaustive="True" @@ -157,7 +157,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed", // https://drafts.csswg.org/css-logical-props/#float-clear extra_specified="inline-start inline-end" needs_conversion="True" - animatable="False" + animation_type="none" gecko_enum_prefix="StyleClear" gecko_ffi_name="mBreakType" spec="https://www.w3.org/TR/CSS2/visuren.html#flow-control"> @@ -192,7 +192,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed", <%helpers:longhand name="-servo-display-for-hypothetical-box" - animatable="False" + animation_type="none" derived_from="display" products="servo" spec="Internal (not web-exposed)"> @@ -211,7 +211,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed", -<%helpers:longhand name="vertical-align" animatable="True" +<%helpers:longhand name="vertical-align" animation_type="normal" spec="https://www.w3.org/TR/CSS2/visudet.html#propdef-vertical-align"> use std::fmt; use style_traits::ToCss; @@ -342,23 +342,23 @@ ${helpers.single_keyword("position", "static absolute relative fixed", // CSS 2.1, Section 11 - Visual effects ${helpers.single_keyword("-servo-overflow-clip-box", "padding-box content-box", - products="servo", animatable=False, internal=True, + products="servo", animation_type="none", internal=True, spec="Internal, not web-exposed, \ may be standardized in the future (https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-clip-box)")} ${helpers.single_keyword("overflow-clip-box", "padding-box content-box", - products="gecko", animatable=False, internal=True, + products="gecko", animation_type="none", internal=True, spec="Internal, not web-exposed, \ may be standardized in the future (https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-clip-box)")} // FIXME(pcwalton, #2742): Implement scrolling for `scroll` and `auto`. ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", - need_clone=True, animatable=False, + need_clone=True, animation_type="none", gecko_constant_prefix="NS_STYLE_OVERFLOW", spec="https://drafts.csswg.org/css-overflow/#propdef-overflow-x")} // FIXME(pcwalton, #2742): Implement scrolling for `scroll` and `auto`. -<%helpers:longhand name="overflow-y" need_clone="True" animatable="False" +<%helpers:longhand name="overflow-y" need_clone="True" animation_type="none" spec="https://drafts.csswg.org/css-overflow/#propdef-overflow-y"> use super::overflow_x; @@ -405,7 +405,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="transition-duration" need_index="True" - animatable="False" + animation_type="none" extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-transitions/#propdef-transition-duration"> use values::specified::Time; @@ -436,7 +436,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", // TODO(pcwalton): Lots more timing functions. <%helpers:vector_longhand name="transition-timing-function" need_index="True" - animatable="False" + animation_type="none" extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-transitions/#propdef-transition-timing-function"> use self::computed_value::StartEnd; @@ -728,7 +728,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="transition-property" allow_empty="True" need_index="True" - animatable="False" + animation_type="none" extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-transitions/#propdef-transition-property"> @@ -757,7 +757,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="transition-delay" need_index="True" - animatable="False" + animation_type="none" extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-transitions/#propdef-transition-delay"> pub use properties::longhands::transition_duration::single_value::SpecifiedValue; @@ -768,7 +768,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="animation-name" need_index="True" - animatable="False", + animation_type="none", extra_prefixes="moz webkit" allowed_in_keyframe_block="False" spec="https://drafts.csswg.org/css-animations/#propdef-animation-name"> @@ -839,7 +839,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="animation-duration" need_index="True" - animatable="False", + animation_type="none", extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-animations/#propdef-animation-duration", allowed_in_keyframe_block="False"> @@ -851,7 +851,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="animation-timing-function" need_index="True" - animatable="False", + animation_type="none", extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-animations/#propdef-animation-timing-function", allowed_in_keyframe_block="True"> @@ -864,7 +864,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", <%helpers:vector_longhand name="animation-iteration-count" need_index="True" - animatable="False", + animation_type="none", extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-animations/#propdef-animation-iteration-count", allowed_in_keyframe_block="False"> @@ -933,7 +933,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", ${helpers.single_keyword("animation-direction", "normal reverse alternate alternate-reverse", need_index=True, - animatable=False, + animation_type="none", vector=True, gecko_enum_prefix="PlaybackDirection", custom_consts=animation_direction_custom_consts, @@ -947,7 +947,7 @@ ${helpers.single_keyword("animation-play-state", "running paused", need_clone=True, need_index=True, - animatable=False, + animation_type="none", vector=True, extra_prefixes="moz webkit", spec="https://drafts.csswg.org/css-animations/#propdef-animation-play-state", @@ -956,7 +956,7 @@ ${helpers.single_keyword("animation-play-state", ${helpers.single_keyword("animation-fill-mode", "none forwards backwards both", need_index=True, - animatable=False, + animation_type="none", vector=True, gecko_enum_prefix="FillMode", extra_prefixes="moz webkit", @@ -965,7 +965,7 @@ ${helpers.single_keyword("animation-fill-mode", <%helpers:vector_longhand name="animation-delay" need_index="True" - animatable="False", + animation_type="none", extra_prefixes="moz webkit", spec="https://drafts.csswg.org/css-animations/#propdef-animation-delay", allowed_in_keyframe_block="False"> @@ -975,7 +975,7 @@ ${helpers.single_keyword("animation-fill-mode", pub use properties::longhands::transition_duration::single_value::SpecifiedValue; -<%helpers:longhand products="gecko" name="scroll-snap-points-y" animatable="False" +<%helpers:longhand products="gecko" name="scroll-snap-points-y" animation_type="none" spec="Nonstandard (https://www.w3.org/TR/2015/WD-css-snappoints-1-20150326/#scroll-snap-points)"> use std::fmt; use style_traits::ToCss; @@ -1070,7 +1070,7 @@ ${helpers.single_keyword("animation-fill-mode", } -<%helpers:longhand products="gecko" name="scroll-snap-points-x" animatable="False" +<%helpers:longhand products="gecko" name="scroll-snap-points-x" animation_type="none" spec="Nonstandard (https://www.w3.org/TR/2015/WD-css-snappoints-1-20150326/#scroll-snap-points)"> pub use super::scroll_snap_points_y::SpecifiedValue; pub use super::scroll_snap_points_y::computed_value; @@ -1085,7 +1085,7 @@ ${helpers.predefined_type("scroll-snap-destination", products="gecko", boxed="True", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)", - animatable=True)} + animation_type="normal")} ${helpers.predefined_type("scroll-snap-coordinate", "Position", @@ -1093,14 +1093,14 @@ ${helpers.predefined_type("scroll-snap-coordinate", vector=True, products="gecko", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)", - animatable=True, + animation_type="normal", allow_empty=True, delegate_animate=True)} <%helpers:longhand name="transform" products="gecko servo" extra_prefixes="webkit" - animatable="True" + animation_type="normal" creates_stacking_context="True" fixpos_cb="True" spec="https://drafts.csswg.org/css-transforms/#propdef-transform"> @@ -1789,16 +1789,16 @@ ${helpers.single_keyword("scroll-behavior", "auto smooth", products="gecko", spec="https://drafts.csswg.org/cssom-view/#propdef-scroll-behavior", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("scroll-snap-type-x", "none mandatory proximity", products="gecko", gecko_constant_prefix="NS_STYLE_SCROLL_SNAP_TYPE", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-type-x)", - animatable=False)} + animation_type="none")} -<%helpers:longhand products="gecko" name="scroll-snap-type-y" animatable="False" +<%helpers:longhand products="gecko" name="scroll-snap-type-y" animation_type="none" spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-type-x)"> pub use super::scroll_snap_type_x::SpecifiedValue; pub use super::scroll_snap_type_x::computed_value; @@ -1813,26 +1813,26 @@ ${helpers.single_keyword("isolation", products="gecko", spec="https://drafts.fxtf.org/compositing/#isolation", creates_stacking_context=True, - animatable=False)} + animation_type="none")} // TODO add support for logical values recto and verso ${helpers.single_keyword("page-break-after", "auto always avoid left right", products="gecko", spec="https://drafts.csswg.org/css2/page.html#propdef-page-break-after", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("page-break-before", "auto always avoid left right", products="gecko", spec="https://drafts.csswg.org/css2/page.html#propdef-page-break-before", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("page-break-inside", "auto avoid", products="gecko", gecko_ffi_name="mBreakInside", gecko_constant_prefix="NS_STYLE_PAGE_BREAK", spec="https://drafts.csswg.org/css2/page.html#propdef-page-break-inside", - animatable=False)} + animation_type="none")} // CSS Basic User Interface Module Level 3 // http://dev.w3.org/csswg/css-ui @@ -1841,7 +1841,7 @@ ${helpers.single_keyword("resize", "none both horizontal vertical", products="gecko", spec="https://drafts.csswg.org/css-ui/#propdef-resize", - animatable=False)} + animation_type="none")} ${helpers.predefined_type("perspective", @@ -1854,10 +1854,10 @@ ${helpers.predefined_type("perspective", boxed=True, creates_stacking_context=True, fixpos_cb=True, - animatable=True)} + animation_type="normal")} // FIXME: This prop should be animatable -<%helpers:longhand name="perspective-origin" boxed="True" animatable="False" extra_prefixes="moz webkit" +<%helpers:longhand name="perspective-origin" boxed="True" animation_type="none" extra_prefixes="moz webkit" spec="https://drafts.csswg.org/css-transforms/#perspective-origin-property"> use std::fmt; use style_traits::ToCss; @@ -1948,14 +1948,14 @@ ${helpers.single_keyword("backface-visibility", "visible hidden", spec="https://drafts.csswg.org/css-transforms/#backface-visibility-property", extra_prefixes="moz webkit", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("transform-box", "border-box fill-box view-box", gecko_enum_prefix="StyleGeometryBox", products="gecko", spec="https://drafts.csswg.org/css-transforms/#transform-box", - animatable=False)} + animation_type="none")} // `auto` keyword is not supported in gecko yet. ${helpers.single_keyword("transform-style", @@ -1965,9 +1965,9 @@ ${helpers.single_keyword("transform-style", extra_prefixes="moz webkit", creates_stacking_context=True, fixpos_cb=True, - animatable=False)} + animation_type="none")} -<%helpers:longhand name="transform-origin" animatable="True" extra_prefixes="moz webkit" boxed="True" +<%helpers:longhand name="transform-origin" animation_type="normal" extra_prefixes="moz webkit" boxed="True" spec="https://drafts.csswg.org/css-transforms/#transform-origin-property"> use app_units::Au; use std::fmt; @@ -2075,7 +2075,7 @@ ${helpers.single_keyword("transform-style", } -<%helpers:longhand name="contain" animatable="False" products="none" +<%helpers:longhand name="contain" animation_type="none" products="none" spec="https://drafts.csswg.org/css-contain/#contain-property"> use std::fmt; use style_traits::ToCss; @@ -2185,7 +2185,7 @@ ${helpers.single_keyword("appearance", products="gecko", spec="https://drafts.csswg.org/css-ui-4/#appearance-switching", alias="-webkit-appearance", - animatable=False)} + animation_type="none")} // Non-standard ${helpers.single_keyword("-moz-appearance", @@ -2215,11 +2215,11 @@ ${helpers.single_keyword("-moz-appearance", gecko_constant_prefix="NS_THEME", products="gecko", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-appearance)", - animatable=False)} + animation_type="none")} ${helpers.predefined_type("-moz-binding", "UrlOrNone", "Either::Second(None_)", products="gecko", - animatable="False", + animation_type="none", gecko_ffi_name="mBinding", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-binding)", disable_when_testing="True")} @@ -2230,9 +2230,9 @@ ${helpers.single_keyword("-moz-orient", gecko_ffi_name="mOrient", gecko_enum_prefix="StyleOrient", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-orient)", - animatable=False)} + animation_type="none")} -<%helpers:longhand name="will-change" products="gecko" animatable="False" +<%helpers:longhand name="will-change" products="gecko" animation_type="none" spec="https://drafts.csswg.org/css-will-change/#will-change"> use cssparser::serialize_identifier; use std::fmt; diff --git a/components/style/properties/longhand/color.mako.rs b/components/style/properties/longhand/color.mako.rs index 3825df7c128..0474bcb837d 100644 --- a/components/style/properties/longhand/color.mako.rs +++ b/components/style/properties/longhand/color.mako.rs @@ -8,7 +8,7 @@ <% from data import to_rust_ident %> -<%helpers:longhand name="color" need_clone="True" animatable="True" +<%helpers:longhand name="color" need_clone="True" animation_type="normal" spec="https://drafts.csswg.org/css-color/#color"> use cssparser::RGBA; use std::fmt; diff --git a/components/style/properties/longhand/column.mako.rs b/components/style/properties/longhand/column.mako.rs index c0d6d51c4a7..fbbf8252dbf 100644 --- a/components/style/properties/longhand/column.mako.rs +++ b/components/style/properties/longhand/column.mako.rs @@ -14,7 +14,7 @@ ${helpers.predefined_type("column-width", parse_method="parse_non_negative_length", extra_prefixes="moz", boxed=True, - animatable=False, + animation_type="none", experimental=True, spec="https://drafts.csswg.org/css-multicol/#propdef-column-width")} @@ -25,7 +25,7 @@ ${helpers.predefined_type("column-count", "IntegerOrAuto", parse_method="parse_positive", initial_specified_value="Either::Second(Auto)", experimental="True", - animatable="False", + animation_type="none", extra_prefixes="moz", spec="https://drafts.csswg.org/css-multicol/#propdef-column-count")} @@ -37,15 +37,15 @@ ${helpers.predefined_type("column-gap", extra_prefixes="moz", experimental=True, boxed=True, - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-multicol/#propdef-column-gap")} ${helpers.single_keyword("column-fill", "balance auto", extra_prefixes="moz", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.csswg.org/css-multicol/#propdef-column-fill")} // https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-width -<%helpers:longhand name="column-rule-width" products="gecko" boxed="True" animatable="True" extra_prefixes="moz" +<%helpers:longhand name="column-rule-width" products="gecko" boxed="True" animation_type="normal" extra_prefixes="moz" spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-width"> use app_units::Au; use std::fmt; @@ -79,18 +79,18 @@ ${helpers.single_keyword("column-fill", "balance auto", extra_prefixes="moz", ${helpers.predefined_type("column-rule-color", "CSSColor", "::cssparser::Color::CurrentColor", initial_specified_value="specified::CSSColor::currentcolor()", - products="gecko", animatable=True, extra_prefixes="moz", + products="gecko", animation_type="normal", extra_prefixes="moz", complex_color=True, need_clone=True, spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-color")} // It's not implemented in servo or gecko yet. ${helpers.single_keyword("column-span", "none all", - products="none", animatable=False, + products="none", animation_type="none", spec="https://drafts.csswg.org/css-multicol/#propdef-column-span")} ${helpers.single_keyword("column-rule-style", "none hidden dotted dashed solid double groove ridge inset outset", products="gecko", extra_prefixes="moz", gecko_constant_prefix="NS_STYLE_BORDER_STYLE", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-style")} diff --git a/components/style/properties/longhand/counters.mako.rs b/components/style/properties/longhand/counters.mako.rs index edc7e6927d8..bcea2f00a82 100644 --- a/components/style/properties/longhand/counters.mako.rs +++ b/components/style/properties/longhand/counters.mako.rs @@ -6,7 +6,7 @@ <% data.new_style_struct("Counters", inherited=False, gecko_name="Content") %> -<%helpers:longhand name="content" boxed="True" animatable="False" +<%helpers:longhand name="content" boxed="True" animation_type="none" spec="https://drafts.csswg.org/css-content/#propdef-content"> use cssparser::Token; use std::ascii::AsciiExt; @@ -240,7 +240,7 @@ } -<%helpers:longhand name="counter-increment" animatable="False" +<%helpers:longhand name="counter-increment" animation_type="none" spec="https://drafts.csswg.org/css-lists/#propdef-counter-increment"> use std::fmt; use style_traits::ToCss; @@ -362,7 +362,7 @@ } -<%helpers:longhand name="counter-reset" animatable="False" +<%helpers:longhand name="counter-reset" animation_type="none" spec="https://drafts.csswg.org/css-lists-3/#propdef-counter-reset"> pub use super::counter_increment::{SpecifiedValue, computed_value, get_initial_value}; use super::counter_increment::parse_common; diff --git a/components/style/properties/longhand/effects.mako.rs b/components/style/properties/longhand/effects.mako.rs index 19603fad5da..1392475f09c 100644 --- a/components/style/properties/longhand/effects.mako.rs +++ b/components/style/properties/longhand/effects.mako.rs @@ -10,12 +10,12 @@ ${helpers.predefined_type("opacity", "Opacity", "1.0", - animatable=True, + animation_type="normal", creates_stacking_context=True, spec="https://drafts.csswg.org/css-color/#opacity")} <%helpers:vector_longhand name="box-shadow" allow_empty="True" - animatable="True" extra_prefixes="webkit" + animation_type="normal" extra_prefixes="webkit" spec="https://drafts.csswg.org/css-backgrounds/#box-shadow"> use cssparser; use std::fmt; @@ -81,12 +81,12 @@ ${helpers.predefined_type("opacity", ${helpers.predefined_type("clip", "ClipRectOrAuto", "computed::ClipRectOrAuto::auto()", - animatable=False, + animation_type="none", boxed="True", spec="https://drafts.fxtf.org/css-masking/#clip-property")} // FIXME: This prop should be animatable -<%helpers:longhand name="filter" animatable="False" extra_prefixes="webkit" +<%helpers:longhand name="filter" animation_type="none" extra_prefixes="webkit" creates_stacking_context="True" fixpos_cb="True" spec="https://drafts.fxtf.org/filters/#propdef-filter"> @@ -518,6 +518,6 @@ ${helpers.single_keyword("mix-blend-mode", """normal multiply screen overlay darken lighten color-dodge color-burn hard-light soft-light difference exclusion hue saturation color luminosity""", gecko_constant_prefix="NS_STYLE_BLEND", - animatable=False, + animation_type="none", creates_stacking_context=True, spec="https://drafts.fxtf.org/compositing/#propdef-mix-blend-mode")} diff --git a/components/style/properties/longhand/font.mako.rs b/components/style/properties/longhand/font.mako.rs index a300fae7900..b7ef293239c 100644 --- a/components/style/properties/longhand/font.mako.rs +++ b/components/style/properties/longhand/font.mako.rs @@ -7,7 +7,7 @@ <% data.new_style_struct("Font", inherited=True) %> -<%helpers:longhand name="font-family" animatable="False" need_index="True" +<%helpers:longhand name="font-family" animation_type="none" need_index="True" spec="https://drafts.csswg.org/css-fonts/#propdef-font-family"> use self::computed_value::{FontFamily, FamilyName}; use values::HasViewportPercentage; @@ -225,12 +225,12 @@ ${helpers.single_keyword("font-style", gecko_constant_prefix="NS_FONT_STYLE", gecko_ffi_name="mFont.style", spec="https://drafts.csswg.org/css-fonts/#propdef-font-style", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("font-variant", "normal small-caps", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant", - animatable=False)} + animation_type="none")} <% font_variant_caps_custom_consts= { "small-caps": "SMALLCAPS", @@ -246,9 +246,9 @@ ${helpers.single_keyword("font-variant-caps", products="gecko", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-caps", custom_consts=font_variant_caps_custom_consts, - animatable=False)} + animation_type="none")} -<%helpers:longhand name="font-weight" need_clone="True" animatable="True" +<%helpers:longhand name="font-weight" need_clone="True" animation_type="normal" spec="https://drafts.csswg.org/css-fonts/#propdef-font-weight"> use std::fmt; use style_traits::ToCss; @@ -409,7 +409,7 @@ ${helpers.single_keyword("font-variant-caps", } -<%helpers:longhand name="font-size" need_clone="True" animatable="True" +<%helpers:longhand name="font-size" need_clone="True" animation_type="normal" spec="https://drafts.csswg.org/css-fonts/#propdef-font-size"> use app_units::Au; use std::fmt; @@ -674,7 +674,7 @@ ${helpers.single_keyword("font-variant-caps", } -<%helpers:longhand products="gecko" name="font-size-adjust" animatable="True" +<%helpers:longhand products="gecko" name="font-size-adjust" animation_type="normal" spec="https://drafts.csswg.org/css-fonts/#propdef-font-size-adjust"> use std::fmt; use style_traits::ToCss; @@ -775,7 +775,7 @@ ${helpers.single_keyword("font-variant-caps", } -<%helpers:longhand products="gecko" name="font-synthesis" animatable="False" +<%helpers:longhand products="gecko" name="font-synthesis" animation_type="none" spec="https://drafts.csswg.org/css-fonts/#propdef-font-synthesis"> use std::fmt; use style_traits::ToCss; @@ -847,7 +847,7 @@ ${helpers.single_keyword("font-stretch", gecko_constant_prefix="NS_FONT_STRETCH", cast_type='i16', spec="https://drafts.csswg.org/css-fonts/#propdef-font-stretch", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("font-kerning", "auto none normal", @@ -855,7 +855,7 @@ ${helpers.single_keyword("font-kerning", gecko_ffi_name="mFont.kerning", gecko_constant_prefix="NS_FONT_KERNING", spec="https://drafts.csswg.org/css-fonts/#propdef-font-stretch", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("font-variant-position", "normal sub super", @@ -863,9 +863,9 @@ ${helpers.single_keyword("font-variant-position", gecko_ffi_name="mFont.variantPosition", gecko_constant_prefix="NS_FONT_VARIANT_POSITION", spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-position", - animatable=False)} + animation_type="none")} -<%helpers:longhand name="font-feature-settings" products="none" animatable="False" extra_prefixes="moz" +<%helpers:longhand name="font-feature-settings" products="none" animation_type="none" extra_prefixes="moz" spec="https://drafts.csswg.org/css-fonts/#propdef-font-feature-settings"> use std::fmt; use style_traits::ToCss; @@ -975,7 +975,7 @@ ${helpers.single_keyword("font-variant-position", } -<%helpers:longhand name="font-language-override" products="gecko" animatable="False" extra_prefixes="moz" +<%helpers:longhand name="font-language-override" products="gecko" animation_type="none" extra_prefixes="moz" spec="https://drafts.csswg.org/css-fonts-3/#propdef-font-language-override"> use std::fmt; use style_traits::ToCss; @@ -1093,7 +1093,7 @@ ${helpers.single_keyword("font-variant-position", } -<%helpers:longhand name="-x-lang" products="gecko" animatable="False" internal="True" +<%helpers:longhand name="-x-lang" products="gecko" animation_type="none" internal="True" spec="Internal (not web-exposed)" internal="True"> use values::HasViewportPercentage; diff --git a/components/style/properties/longhand/inherited_box.mako.rs b/components/style/properties/longhand/inherited_box.mako.rs index 2c916ac44ea..d57e5d42039 100644 --- a/components/style/properties/longhand/inherited_box.mako.rs +++ b/components/style/properties/longhand/inherited_box.mako.rs @@ -11,7 +11,7 @@ ${helpers.single_keyword("visibility", "visible hidden", extra_gecko_values="collapse", gecko_ffi_name="mVisible", - animatable=True, + animation_type="normal", spec="https://drafts.csswg.org/css-box/#propdef-visibility")} // CSS Writing Modes Level 3 @@ -20,10 +20,10 @@ ${helpers.single_keyword("writing-mode", "horizontal-tb vertical-rl vertical-lr", experimental=True, need_clone=True, - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-writing-modes/#propdef-writing-mode")} -${helpers.single_keyword("direction", "ltr rtl", need_clone=True, animatable=False, +${helpers.single_keyword("direction", "ltr rtl", need_clone=True, animation_type="none", spec="https://drafts.csswg.org/css-writing-modes/#propdef-direction")} <%helpers:single_keyword_computed @@ -32,7 +32,7 @@ ${helpers.single_keyword("direction", "ltr rtl", need_clone=True, animatable=Fal extra_specified="sideways-right" products="gecko" need_clone="True" - animatable="False" + animation_type="none" spec="https://drafts.csswg.org/css-writing-modes/#propdef-text-orientation" > use values::HasViewportPercentage; @@ -67,7 +67,7 @@ ${helpers.single_keyword("direction", "ltr rtl", need_clone=True, animatable=Fal // https://drafts.csswg.org/css-color/ ${helpers.single_keyword("color-adjust", "economy exact", products="gecko", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-color/#propdef-color-adjust")} <% image_rendering_custom_consts = { "crisp-edges": "CRISPEDGES" } %> @@ -78,13 +78,13 @@ ${helpers.single_keyword("image-rendering", extra_gecko_values="optimizespeed optimizequality", extra_servo_values="pixelated", custom_consts=image_rendering_custom_consts, - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-images/#propdef-image-rendering")} // Image Orientation <%helpers:longhand name="image-orientation" products="None" - animatable="False" + animation_type="none" spec="https://drafts.csswg.org/css-images/#propdef-image-orientation, \ /// additional values in https://developer.mozilla.org/en-US/docs/Web/CSS/image-orientation"> use std::fmt; @@ -223,7 +223,7 @@ ${helpers.single_keyword("image-rendering", <%helpers:longhand name="-servo-under-display-none" derived_from="display" products="servo" - animatable="False" + animation_type="none" spec="Nonstandard (internal layout use only)"> use std::fmt; use style_traits::ToCss; diff --git a/components/style/properties/longhand/inherited_svg.mako.rs b/components/style/properties/longhand/inherited_svg.mako.rs index 241a08905b4..2d051590b62 100644 --- a/components/style/properties/longhand/inherited_svg.mako.rs +++ b/components/style/properties/longhand/inherited_svg.mako.rs @@ -17,51 +17,51 @@ ${helpers.single_keyword("text-anchor", "start middle end", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG/text.html#TextAnchorProperty")} // Section 11 - Painting: Filling, Stroking and Marker Symbols ${helpers.single_keyword("color-interpolation", "srgb auto linearrgb", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationProperty")} ${helpers.single_keyword("color-interpolation-filters", "linearrgb auto srgb", products="gecko", gecko_constant_prefix="NS_STYLE_COLOR_INTERPOLATION", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationFiltersProperty")} ${helpers.predefined_type( "fill", "SVGPaint", "::values::computed::SVGPaint::black()", products="gecko", - animatable=False, + animation_type="none", boxed=True, spec="https://www.w3.org/TR/SVG2/painting.html#SpecifyingFillPaint")} ${helpers.predefined_type("fill-opacity", "Opacity", "1.0", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#FillOpacityProperty")} ${helpers.single_keyword("fill-rule", "nonzero evenodd", gecko_enum_prefix="StyleFillRule", gecko_inexhaustive=True, - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#FillRuleProperty")} ${helpers.single_keyword("shape-rendering", "auto optimizespeed crispedges geometricprecision", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#ShapeRenderingProperty")} ${helpers.predefined_type( "stroke", "SVGPaint", "Default::default()", products="gecko", - animatable=False, + animation_type="none", boxed=True, spec="https://www.w3.org/TR/SVG2/painting.html#SpecifyingStrokePaint")} @@ -70,26 +70,26 @@ ${helpers.predefined_type( "computed::LengthOrPercentage::one()", "parse_numbers_are_pixels_non_negative", products="gecko", - animatable=True, + animation_type="normal", needs_context=False, spec="https://www.w3.org/TR/SVG2/painting.html#StrokeWidth")} ${helpers.single_keyword("stroke-linecap", "butt round square", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#StrokeLinecapProperty")} ${helpers.single_keyword("stroke-linejoin", "miter round bevel", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#StrokeLinejoinProperty")} ${helpers.predefined_type("stroke-miterlimit", "Number", "4.0", "parse_at_least_one", products="gecko", needs_context=False, - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#StrokeMiterlimitProperty")} ${helpers.predefined_type("stroke-opacity", "Opacity", "1.0", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#StrokeOpacityProperty")} ${helpers.predefined_type("stroke-dasharray", @@ -98,7 +98,7 @@ ${helpers.predefined_type("stroke-dasharray", "parse_non_negative", vector="True", products="gecko", - animatable="False", + animation_type="none", space_separated_allowed="True", spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing")} @@ -107,7 +107,7 @@ ${helpers.predefined_type( "computed::LengthOrPercentage::zero()", "parse_numbers_are_pixels", products="gecko", - animatable=True, + animation_type="normal", needs_context=False, spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing")} @@ -116,26 +116,26 @@ ${helpers.single_keyword("clip-rule", "nonzero evenodd", products="gecko", gecko_enum_prefix="StyleFillRule", gecko_inexhaustive=True, - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/masking.html#ClipRuleProperty")} ${helpers.predefined_type("marker-start", "UrlOrNone", "Either::Second(None_)", products="gecko", - animatable="False", + animation_type="none", spec="https://www.w3.org/TR/SVG2/painting.html#VertexMarkerProperties")} ${helpers.predefined_type("marker-mid", "UrlOrNone", "Either::Second(None_)", products="gecko", - animatable="False", + animation_type="none", spec="https://www.w3.org/TR/SVG2/painting.html#VertexMarkerProperties")} ${helpers.predefined_type("marker-end", "UrlOrNone", "Either::Second(None_)", products="gecko", - animatable="False", + animation_type="none", spec="https://www.w3.org/TR/SVG2/painting.html#VertexMarkerProperties")} <%helpers:longhand name="paint-order" - animatable="False" + animation_type="none" products="gecko" spec="https://www.w3.org/TR/SVG2/painting.html#PaintOrder"> diff --git a/components/style/properties/longhand/inherited_table.mako.rs b/components/style/properties/longhand/inherited_table.mako.rs index 4e1d9a60825..b72482ce1fc 100644 --- a/components/style/properties/longhand/inherited_table.mako.rs +++ b/components/style/properties/longhand/inherited_table.mako.rs @@ -8,19 +8,19 @@ ${helpers.single_keyword("border-collapse", "separate collapse", gecko_constant_prefix="NS_STYLE_BORDER", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-tables/#propdef-border-collapse")} ${helpers.single_keyword("empty-cells", "show hide", gecko_constant_prefix="NS_STYLE_TABLE_EMPTY_CELLS", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-tables/#propdef-empty-cells")} ${helpers.single_keyword("caption-side", "top bottom", extra_gecko_values="right left top-outside bottom-outside", needs_conversion="True", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-tables/#propdef-caption-side")} -<%helpers:longhand name="border-spacing" animatable="False" boxed="True" +<%helpers:longhand name="border-spacing" animation_type="none" boxed="True" spec="https://drafts.csswg.org/css-tables/#propdef-border-spacing"> use app_units::Au; use std::fmt; diff --git a/components/style/properties/longhand/inherited_text.mako.rs b/components/style/properties/longhand/inherited_text.mako.rs index 47075cbc8cd..d1557ff70e8 100644 --- a/components/style/properties/longhand/inherited_text.mako.rs +++ b/components/style/properties/longhand/inherited_text.mako.rs @@ -6,7 +6,7 @@ <% from data import Keyword %> <% data.new_style_struct("InheritedText", inherited=True, gecko_name="Text") %> -<%helpers:longhand name="line-height" animatable="True" +<%helpers:longhand name="line-height" animation_type="normal" spec="https://drafts.csswg.org/css2/visudet.html#propdef-line-height"> use std::fmt; use style_traits::ToCss; @@ -165,25 +165,25 @@ ${helpers.single_keyword("text-transform", "none capitalize uppercase lowercase", extra_gecko_values="full-width", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-text/#propdef-text-transform")} ${helpers.single_keyword("hyphens", "manual none auto", gecko_enum_prefix="StyleHyphens", - products="gecko", animatable=False, extra_prefixes="moz", + products="gecko", animation_type="none", extra_prefixes="moz", spec="https://drafts.csswg.org/css-text/#propdef-hyphens")} // TODO: Support ${helpers.single_keyword("-moz-text-size-adjust", "auto none", gecko_constant_prefix="NS_STYLE_TEXT_SIZE_ADJUST", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.csswg.org/css-size-adjust/#adjustment-control", alias="-webkit-text-size-adjust")} ${helpers.predefined_type("text-indent", "LengthOrPercentage", "computed::LengthOrPercentage::Length(Au(0))", - animatable=True, + animation_type="normal", spec="https://drafts.csswg.org/css-text/#propdef-text-indent")} // Also known as "word-wrap" (which is more popular because of IE), but this is the preferred @@ -191,7 +191,7 @@ ${helpers.predefined_type("text-indent", ${helpers.single_keyword("overflow-wrap", "normal break-word", gecko_constant_prefix="NS_STYLE_OVERFLOWWRAP", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap", alias="word-wrap")} @@ -199,7 +199,7 @@ ${helpers.single_keyword("overflow-wrap", ${helpers.single_keyword("word-break", "normal break-all keep-all", gecko_constant_prefix="NS_STYLE_WORDBREAK", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-text/#propdef-word-break")} // TODO(pcwalton): Support `text-justify: distribute`. @@ -208,7 +208,7 @@ ${helpers.single_keyword("word-break", extra_gecko_values="inter-character" extra_specified="${'distribute' if product == 'gecko' else ''}" gecko_enum_prefix="StyleTextJustify" - animatable="False" + animation_type="none" spec="https://drafts.csswg.org/css-text/#propdef-text-justify"> use values::HasViewportPercentage; no_viewport_percentage!(SpecifiedValue); @@ -248,11 +248,11 @@ ${helpers.single_keyword("text-align-last", "auto start end left right center justify", products="gecko", gecko_constant_prefix="NS_STYLE_TEXT_ALIGN", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-text/#propdef-text-align-last")} // TODO make this a shorthand and implement text-align-last/text-align-all -<%helpers:longhand name="text-align" animatable="False" need_clone="True" +<%helpers:longhand name="text-align" animation_type="none" need_clone="True" spec="https://drafts.csswg.org/css-text/#propdef-text-align"> use values::computed::ComputedValueAsSpecified; use values::HasViewportPercentage; @@ -406,7 +406,7 @@ ${helpers.single_keyword("text-align-last", % endif -<%helpers:longhand name="letter-spacing" boxed="True" animatable="True" +<%helpers:longhand name="letter-spacing" boxed="True" animation_type="normal" spec="https://drafts.csswg.org/css-text/#propdef-letter-spacing"> use std::fmt; use style_traits::ToCss; @@ -510,7 +510,7 @@ ${helpers.single_keyword("text-align-last", } -<%helpers:longhand name="word-spacing" animatable="False" +<%helpers:longhand name="word-spacing" animation_type="none" spec="https://drafts.csswg.org/css-text/#propdef-word-spacing"> use std::fmt; use style_traits::ToCss; @@ -595,7 +595,7 @@ ${helpers.single_keyword("text-align-last", <%helpers:longhand name="-servo-text-decorations-in-effect" derived_from="display text-decoration" need_clone="True" products="servo" - animatable="False" + animation_type="none" spec="Nonstandard (Internal property used by Servo)"> use cssparser::RGBA; use std::fmt; @@ -682,7 +682,7 @@ ${helpers.single_keyword("text-align-last", values="normal pre nowrap pre-wrap pre-line" gecko_constant_prefix="NS_STYLE_WHITESPACE" needs_conversion="True" - animatable="False" + animation_type="none" spec="https://drafts.csswg.org/css-text/#propdef-white-space"> use values::computed::ComputedValueAsSpecified; use values::HasViewportPercentage; @@ -722,7 +722,7 @@ ${helpers.single_keyword("text-align-last", } -<%helpers:longhand name="text-shadow" animatable="True" +<%helpers:longhand name="text-shadow" animation_type="normal" spec="https://drafts.csswg.org/css-text-decor/#propdef-text-shadow"> use cssparser; use std::fmt; @@ -932,7 +932,7 @@ ${helpers.single_keyword("text-align-last", } -<%helpers:longhand name="text-emphasis-style" products="gecko" need_clone="True" boxed="True" animatable="False" +<%helpers:longhand name="text-emphasis-style" products="gecko" need_clone="True" boxed="True" animation_type="none" spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-style"> use computed_values::writing_mode::T as writing_mode; use std::fmt; @@ -1140,7 +1140,7 @@ ${helpers.single_keyword("text-align-last", } -<%helpers:longhand name="text-emphasis-position" animatable="False" products="gecko" +<%helpers:longhand name="text-emphasis-position" animation_type="none" products="gecko" spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position"> use std::fmt; use values::computed::ComputedValueAsSpecified; @@ -1215,7 +1215,7 @@ ${helpers.single_keyword("text-align-last", ${helpers.predefined_type("text-emphasis-color", "CSSColor", "::cssparser::Color::CurrentColor", initial_specified_value="specified::CSSColor::currentcolor()", - products="gecko", animatable=True, + products="gecko", animation_type="normal", complex_color=True, need_clone=True, spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-color")} @@ -1224,7 +1224,7 @@ ${helpers.predefined_type( "-moz-tab-size", "LengthOrNumber", "::values::Either::Second(8.0)", "parse_non_negative", - products="gecko", boxed=True, animatable=False, + products="gecko", boxed=True, animation_type="none", spec="https://drafts.csswg.org/css-text-3/#tab-size-property")} @@ -1233,7 +1233,7 @@ ${helpers.predefined_type( ${helpers.predefined_type( "-webkit-text-fill-color", "CSSColor", "CSSParserColor::CurrentColor", - products="gecko", animatable=True, + products="gecko", animation_type="normal", complex_color=True, need_clone=True, spec="https://compat.spec.whatwg.org/#the-webkit-text-fill-color")} @@ -1241,11 +1241,11 @@ ${helpers.predefined_type( "-webkit-text-stroke-color", "CSSColor", "CSSParserColor::CurrentColor", initial_specified_value="specified::CSSColor::currentcolor()", - products="gecko", animatable=True, + products="gecko", animation_type="normal", complex_color=True, need_clone=True, spec="https://compat.spec.whatwg.org/#the-webkit-text-stroke-color")} -<%helpers:longhand products="gecko" name="-webkit-text-stroke-width" boxed="True" animatable="False" +<%helpers:longhand products="gecko" name="-webkit-text-stroke-width" boxed="True" animation_type="none" spec="https://compat.spec.whatwg.org/#the-webkit-text-stroke-width"> use app_units::Au; use std::fmt; @@ -1277,11 +1277,11 @@ ${helpers.predefined_type( // CSS Ruby Layout Module Level 1 // https://drafts.csswg.org/css-ruby/ ${helpers.single_keyword("ruby-align", "space-around start center space-between", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.csswg.org/css-ruby/#ruby-align-property")} ${helpers.single_keyword("ruby-position", "over under", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.csswg.org/css-ruby/#ruby-position-property")} // CSS Writing Modes Module Level 3 @@ -1291,11 +1291,11 @@ ${helpers.single_keyword("ruby-position", "over under", // at-risk, and Gecko's layout code doesn't support that either. So we // can just take the easy way for now. ${helpers.single_keyword("text-combine-upright", "none all", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.csswg.org/css-writing-modes-3/#text-combine-upright")} // SVG 1.1: Section 11 - Painting: Filling, Stroking and Marker Symbols ${helpers.single_keyword("text-rendering", "auto optimizespeed optimizelegibility geometricprecision", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/painting.html#TextRenderingProperty")} diff --git a/components/style/properties/longhand/list.mako.rs b/components/style/properties/longhand/list.mako.rs index 81ce62a32e1..514e3bd6133 100644 --- a/components/style/properties/longhand/list.mako.rs +++ b/components/style/properties/longhand/list.mako.rs @@ -6,7 +6,7 @@ <% data.new_style_struct("List", inherited=True) %> -${helpers.single_keyword("list-style-position", "outside inside", animatable=False, +${helpers.single_keyword("list-style-position", "outside inside", animation_type="none", spec="https://drafts.csswg.org/css-lists/#propdef-list-style-position")} // TODO(pcwalton): Implement the full set of counter styles per CSS-COUNTER-STYLES [1] 6.1: @@ -34,14 +34,14 @@ ${helpers.single_keyword("list-style-type", """ """, gecko_constant_prefix="NS_STYLE_LIST_STYLE", needs_conversion="True", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-lists/#propdef-list-style-type")} ${helpers.predefined_type("list-style-image", "UrlOrNone", "Either::Second(None_)", - initial_specified_value="Either::Second(None_)", animatable=False, + initial_specified_value="Either::Second(None_)", animation_type="none", spec="https://drafts.csswg.org/css-lists/#propdef-list-style-image")} -<%helpers:longhand name="quotes" animatable="False" +<%helpers:longhand name="quotes" animation_type="none" spec="https://drafts.csswg.org/css-content/#propdef-quotes"> use cssparser::Token; use std::borrow::Cow; @@ -118,7 +118,7 @@ ${helpers.predefined_type("list-style-image", "UrlOrNone", "Either::Second(None_ ${helpers.predefined_type("-moz-image-region", "ClipRectOrAuto", "computed::ClipRectOrAuto::auto()", - animatable=False, + animation_type="none", products="gecko", boxed="True", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-image-region)")} diff --git a/components/style/properties/longhand/margin.mako.rs b/components/style/properties/longhand/margin.mako.rs index 0875b4673c3..bab8eb76f43 100644 --- a/components/style/properties/longhand/margin.mako.rs +++ b/components/style/properties/longhand/margin.mako.rs @@ -15,5 +15,5 @@ ${helpers.predefined_type("margin-%s" % side[0], "LengthOrPercentageOrAuto", "computed::LengthOrPercentageOrAuto::Length(Au(0))", alias=maybe_moz_logical_alias(product, side, "-moz-margin-%s"), - animatable=True, logical = side[1], spec = spec)} + animation_type="normal", logical = side[1], spec = spec)} % endfor diff --git a/components/style/properties/longhand/outline.mako.rs b/components/style/properties/longhand/outline.mako.rs index 97f3363ad15..5fba4d67345 100644 --- a/components/style/properties/longhand/outline.mako.rs +++ b/components/style/properties/longhand/outline.mako.rs @@ -12,10 +12,10 @@ // TODO(pcwalton): `invert` ${helpers.predefined_type("outline-color", "CSSColor", "computed::CSSColor::CurrentColor", initial_specified_value="specified::CSSColor::currentcolor()", - animatable=True, complex_color=True, need_clone=True, + animation_type="normal", complex_color=True, need_clone=True, spec="https://drafts.csswg.org/css-ui/#propdef-outline-color")} -<%helpers:longhand name="outline-style" need_clone="True" animatable="False" +<%helpers:longhand name="outline-style" need_clone="True" animation_type="none" spec="https://drafts.csswg.org/css-ui/#propdef-outline-style"> use std::fmt; @@ -64,7 +64,7 @@ ${helpers.predefined_type("outline-color", "CSSColor", "computed::CSSColor::Curr } -<%helpers:longhand name="outline-width" animatable="True" +<%helpers:longhand name="outline-width" animation_type="normal" spec="https://drafts.csswg.org/css-ui/#propdef-outline-width"> use app_units::Au; use std::fmt; @@ -124,9 +124,9 @@ ${helpers.predefined_type("outline-color", "CSSColor", "computed::CSSColor::Curr "computed::BorderRadiusSize::zero()", "parse", products="gecko", boxed=True, - animatable=False, + animation_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-outline-radius)")} % endfor -${helpers.predefined_type("outline-offset", "Length", "Au(0)", products="servo gecko", animatable=True, +${helpers.predefined_type("outline-offset", "Length", "Au(0)", products="servo gecko", animation_type="normal", spec="https://drafts.csswg.org/css-ui/#propdef-outline-offset")} diff --git a/components/style/properties/longhand/padding.mako.rs b/components/style/properties/longhand/padding.mako.rs index a25eabd240f..75786ab1bd9 100644 --- a/components/style/properties/longhand/padding.mako.rs +++ b/components/style/properties/longhand/padding.mako.rs @@ -17,7 +17,7 @@ "parse_non_negative", alias=maybe_moz_logical_alias(product, side, "-moz-padding-%s"), needs_context=False, - animatable=True, + animation_type="normal", logical = side[1], spec = spec)} % endfor diff --git a/components/style/properties/longhand/pointing.mako.rs b/components/style/properties/longhand/pointing.mako.rs index 49fee4369e5..d76072a5e39 100644 --- a/components/style/properties/longhand/pointing.mako.rs +++ b/components/style/properties/longhand/pointing.mako.rs @@ -6,7 +6,7 @@ <% data.new_style_struct("Pointing", inherited=True, gecko_name="UserInterface") %> -<%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animatable="False" +<%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animation_type="none" spec="https://drafts.csswg.org/css-ui/#cursor"> pub use self::computed_value::T as SpecifiedValue; use values::HasViewportPercentage; @@ -147,21 +147,21 @@ // NB: `pointer-events: auto` (and use of `pointer-events` in anything that isn't SVG, in fact) // is nonstandard, slated for CSS4-UI. // TODO(pcwalton): SVG-only values. -${helpers.single_keyword("pointer-events", "auto none", animatable=False, +${helpers.single_keyword("pointer-events", "auto none", animation_type="none", spec="https://www.w3.org/TR/SVG11/interact.html#PointerEventsProperty")} ${helpers.single_keyword("-moz-user-input", "auto none enabled disabled", products="gecko", gecko_ffi_name="mUserInput", gecko_enum_prefix="StyleUserInput", gecko_inexhaustive=True, - animatable=False, + animation_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-user-input)")} ${helpers.single_keyword("-moz-user-modify", "read-only read-write write-only", products="gecko", gecko_ffi_name="mUserModify", gecko_enum_prefix="StyleUserModify", needs_conversion=True, - animatable=False, + animation_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-user-modify)")} ${helpers.single_keyword("-moz-user-focus", @@ -169,13 +169,13 @@ ${helpers.single_keyword("-moz-user-focus", products="gecko", gecko_ffi_name="mUserFocus", gecko_enum_prefix="StyleUserFocus", gecko_inexhaustive=True, - animatable=False, + animation_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-user-focus)")} ${helpers.predefined_type("caret-color", "ColorOrAuto", "Either::Second(Auto)", spec="https://drafts.csswg.org/css-ui/#caret-color", - animatable="True", + animation_type="normal", boxed=True, products="gecko")} diff --git a/components/style/properties/longhand/position.mako.rs b/components/style/properties/longhand/position.mako.rs index a5df58b28af..35664ea5311 100644 --- a/components/style/properties/longhand/position.mako.rs +++ b/components/style/properties/longhand/position.mako.rs @@ -13,21 +13,21 @@ ${helpers.predefined_type(side, "LengthOrPercentageOrAuto", "computed::LengthOrPercentageOrAuto::Auto", spec="https://www.w3.org/TR/CSS2/visuren.html#propdef-%s" % side, - animatable=True)} + animation_type="normal")} % endfor // offset-* logical properties, map to "top" / "left" / "bottom" / "right" % for side in LOGICAL_SIDES: ${helpers.predefined_type("offset-%s" % side, "LengthOrPercentageOrAuto", "computed::LengthOrPercentageOrAuto::Auto", spec="https://drafts.csswg.org/css-logical-props/#propdef-offset-%s" % side, - animatable=True, logical=True)} + animation_type="normal", logical=True)} % endfor ${helpers.predefined_type("z-index", "IntegerOrAuto", "Either::Second(Auto)", spec="https://www.w3.org/TR/CSS2/visuren.html#z-index", creates_stacking_context=True, - animatable="True")} + animation_type="normal")} // CSS Flexible Box Layout Module Level 1 // http://www.w3.org/TR/css3-flexbox/ @@ -35,25 +35,25 @@ ${helpers.predefined_type("z-index", "IntegerOrAuto", // Flex container properties ${helpers.single_keyword("flex-direction", "row row-reverse column column-reverse", spec="https://drafts.csswg.org/css-flexbox/#flex-direction-property", - extra_prefixes="webkit", animatable=False)} + extra_prefixes="webkit", animation_type="none")} ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse", spec="https://drafts.csswg.org/css-flexbox/#flex-wrap-property", - extra_prefixes="webkit", animatable=False)} + extra_prefixes="webkit", animation_type="none")} % if product == "servo": // FIXME: Update Servo to support the same Syntax as Gecko. ${helpers.single_keyword("justify-content", "flex-start stretch flex-end center space-between space-around", extra_prefixes="webkit", spec="https://drafts.csswg.org/css-align/#propdef-justify-content", - animatable=False)} + animation_type="none")} % else: ${helpers.predefined_type(name="justify-content", type="AlignJustifyContent", initial_value="specified::AlignJustifyContent::normal()", spec="https://drafts.csswg.org/css-align/#propdef-justify-content", extra_prefixes="webkit", - animatable=False)} + animation_type="none")} % endif % if product == "servo": @@ -61,34 +61,34 @@ ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse", ${helpers.single_keyword("align-content", "stretch flex-start flex-end center space-between space-around", extra_prefixes="webkit", spec="https://drafts.csswg.org/css-align/#propdef-align-content", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("align-items", "stretch flex-start flex-end center baseline", need_clone=True, extra_prefixes="webkit", spec="https://drafts.csswg.org/css-flexbox/#align-items-property", - animatable=False)} + animation_type="none")} % else: ${helpers.predefined_type(name="align-content", type="AlignJustifyContent", initial_value="specified::AlignJustifyContent::normal()", spec="https://drafts.csswg.org/css-align/#propdef-align-content", extra_prefixes="webkit", - animatable=False)} + animation_type="none")} ${helpers.predefined_type(name="align-items", type="AlignItems", initial_value="specified::AlignItems::normal()", spec="https://drafts.csswg.org/css-align/#propdef-align-items", extra_prefixes="webkit", - animatable=False)} + animation_type="none")} ${helpers.predefined_type(name="justify-items", type="JustifyItems", initial_value="specified::JustifyItems::auto()", spec="https://drafts.csswg.org/css-align/#propdef-justify-items", - animatable=False)} + animation_type="none")} % endif // Flex item properties @@ -97,14 +97,14 @@ ${helpers.predefined_type("flex-grow", "Number", spec="https://drafts.csswg.org/css-flexbox/#flex-grow-property", extra_prefixes="webkit", needs_context=False, - animatable=True)} + animation_type="normal")} ${helpers.predefined_type("flex-shrink", "Number", "1.0", "parse_non_negative", spec="https://drafts.csswg.org/css-flexbox/#flex-shrink-property", extra_prefixes="webkit", needs_context=False, - animatable=True)} + animation_type="normal")} // https://drafts.csswg.org/css-align/#align-self-property % if product == "servo": @@ -113,26 +113,26 @@ ${helpers.predefined_type("flex-shrink", "Number", need_clone=True, extra_prefixes="webkit", spec="https://drafts.csswg.org/css-flexbox/#propdef-align-self", - animatable=False)} + animation_type="none")} % else: ${helpers.predefined_type(name="align-self", type="AlignJustifySelf", initial_value="specified::AlignJustifySelf::auto()", spec="https://drafts.csswg.org/css-align/#align-self-property", extra_prefixes="webkit", - animatable=False)} + animation_type="none")} ${helpers.predefined_type(name="justify-self", type="AlignJustifySelf", initial_value="specified::AlignJustifySelf::auto()", spec="https://drafts.csswg.org/css-align/#justify-self-property", - animatable=False)} + animation_type="none")} % endif // https://drafts.csswg.org/css-flexbox/#propdef-order ${helpers.predefined_type("order", "Integer", "0", extra_prefixes="webkit", - animatable=True, + animation_type="normal", spec="https://drafts.csswg.org/css-flexbox/#order-property")} // FIXME: Gecko doesn't support content value yet. @@ -146,7 +146,7 @@ ${helpers.predefined_type("flex-basis", needs_context=False, spec="https://drafts.csswg.org/css-flexbox/#flex-basis-property", extra_prefixes="webkit", - animatable=True if product == "gecko" else False)} + animation_type="normal" if product == "gecko" else "none")} % for (size, logical) in ALL_SIZES: <% @@ -161,7 +161,7 @@ ${helpers.predefined_type("flex-basis", "parse_non_negative", needs_context=False, spec=spec % size, - animatable=True, logical = logical)} + animation_type="normal", logical = logical)} % if product == "gecko": % for min_max in ["min", "max"]: <% @@ -175,7 +175,7 @@ ${helpers.predefined_type("flex-basis", // Keyword values are only valid in the inline direction; they must // be replaced with auto/none in block. <%helpers:longhand name="${min_max}-${size}" spec="${spec % ('%s-%s' % (min_max, size))}" - animatable="True" logical="${logical}" predefined_type="${MinMax}Length"> + animation_type="normal" logical="${logical}" predefined_type="${MinMax}Length"> use std::fmt; use style_traits::ToCss; @@ -251,14 +251,14 @@ ${helpers.predefined_type("flex-basis", "parse_non_negative", needs_context=False, spec=spec % ("min-%s" % size), - animatable=True, logical = logical)} + animation_type="normal", logical = logical)} ${helpers.predefined_type("max-%s" % size, "LengthOrPercentageOrNone", "computed::LengthOrPercentageOrNone::None", "parse_non_negative", needs_context=False, spec=spec % ("min-%s" % size), - animatable=True, logical = logical)} + animation_type="normal", logical = logical)} % endif % endfor @@ -266,10 +266,10 @@ ${helpers.single_keyword("box-sizing", "content-box border-box", extra_prefixes="moz webkit", spec="https://drafts.csswg.org/css-ui/#propdef-box-sizing", - animatable=False)} + animation_type="none")} ${helpers.single_keyword("object-fit", "fill contain cover none scale-down", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.csswg.org/css-images/#propdef-object-fit")} ${helpers.predefined_type("object-position", @@ -278,21 +278,21 @@ ${helpers.predefined_type("object-position", products="gecko", boxed="True", spec="https://drafts.csswg.org/css-images-3/#the-object-position", - animatable=True)} + animation_type="normal")} % for kind in ["row", "column"]: ${helpers.predefined_type("grid-%s-gap" % kind, "LengthOrPercentage", "computed::LengthOrPercentage::Length(Au(0))", spec="https://drafts.csswg.org/css-grid/#propdef-grid-%s-gap" % kind, - animatable=True, + animation_type="normal", products="gecko")} % for range in ["start", "end"]: ${helpers.predefined_type("grid-%s-%s" % (kind, range), "GridLine", "Default::default()", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-grid/#propdef-grid-%s-%s" % (kind, range), products="gecko", boxed=True)} @@ -303,7 +303,7 @@ ${helpers.predefined_type("object-position", ${helpers.predefined_type("grid-auto-%ss" % kind, "TrackSize", "Default::default()", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-grid/#propdef-grid-auto-%ss" % kind, products="gecko", boxed=True)} @@ -312,7 +312,7 @@ ${helpers.predefined_type("object-position", <%helpers:longhand name="grid-auto-flow" spec="https://drafts.csswg.org/css-grid/#propdef-grid-auto-flow" products="gecko" - animatable="False"> + animation_type="none"> use std::fmt; use style_traits::ToCss; use values::HasViewportPercentage; diff --git a/components/style/properties/longhand/svg.mako.rs b/components/style/properties/longhand/svg.mako.rs index fb6532c8a75..070805db75c 100644 --- a/components/style/properties/longhand/svg.mako.rs +++ b/components/style/properties/longhand/svg.mako.rs @@ -11,11 +11,11 @@ ${helpers.single_keyword("dominant-baseline", """auto use-script no-change reset-size ideographic alphabetic hanging mathematical central middle text-after-edge text-before-edge""", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG11/text.html#DominantBaselineProperty")} ${helpers.single_keyword("vector-effect", "none non-scaling-stroke", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVGTiny12/painting.html#VectorEffectProperty")} // Section 13 - Gradients and Patterns @@ -24,12 +24,12 @@ ${helpers.predefined_type( "stop-color", "CSSColor", "CSSParserColor::RGBA(RGBA::new(0, 0, 0, 255))", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVGTiny12/painting.html#StopColorProperty")} ${helpers.predefined_type("stop-opacity", "Opacity", "1.0", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVGTiny12/painting.html#propdef-stop-opacity")} // Section 15 - Filter Effects @@ -38,27 +38,27 @@ ${helpers.predefined_type( "flood-color", "CSSColor", "CSSParserColor::RGBA(RGBA::new(0, 0, 0, 255))", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG/filters.html#FloodColorProperty")} ${helpers.predefined_type("flood-opacity", "Opacity", - "1.0", products="gecko", animatable=False, + "1.0", products="gecko", animation_type="none", spec="https://www.w3.org/TR/SVG/filters.html#FloodOpacityProperty")} ${helpers.predefined_type( "lighting-color", "CSSColor", "CSSParserColor::RGBA(RGBA::new(255, 255, 255, 255))", products="gecko", - animatable=False, + animation_type="none", spec="https://www.w3.org/TR/SVG/filters.html#LightingColorProperty")} // CSS Masking Module Level 1 // https://drafts.fxtf.org/css-masking ${helpers.single_keyword("mask-type", "luminance alpha", - products="gecko", animatable=False, + products="gecko", animation_type="none", spec="https://drafts.fxtf.org/css-masking/#propdef-mask-type")} -<%helpers:longhand name="clip-path" animatable="False" products="gecko" boxed="True" +<%helpers:longhand name="clip-path" animation_type="none" products="gecko" boxed="True" creates_stacking_context="True" spec="https://drafts.fxtf.org/css-masking/#propdef-clip-path"> use std::fmt; @@ -91,10 +91,10 @@ ${helpers.single_keyword("mask-mode", "match-source alpha luminance", vector=True, products="gecko", - animatable=False, + animation_type="none", spec="https://drafts.fxtf.org/css-masking/#propdef-mask-mode")} -<%helpers:vector_longhand name="mask-repeat" products="gecko" animatable="False" extra_prefixes="webkit" +<%helpers:vector_longhand name="mask-repeat" products="gecko" animation_type="none" extra_prefixes="webkit" spec="https://drafts.fxtf.org/css-masking/#propdef-mask-repeat"> pub use properties::longhands::background_repeat::single_value::parse; pub use properties::longhands::background_repeat::single_value::SpecifiedValue; @@ -113,7 +113,7 @@ ${helpers.single_keyword("mask-mode", } -<%helpers:vector_longhand name="mask-position-x" products="gecko" animatable="True" extra_prefixes="webkit" +<%helpers:vector_longhand name="mask-position-x" products="gecko" animation_type="normal" extra_prefixes="webkit" spec="https://drafts.fxtf.org/css-masking/#propdef-mask-position"> pub use properties::longhands::background_position_x::single_value::get_initial_value; pub use properties::longhands::background_position_x::single_value::get_initial_position_value; @@ -134,7 +134,7 @@ ${helpers.single_keyword("mask-mode", impl RepeatableListInterpolate for MaskPositionX {} -<%helpers:vector_longhand name="mask-position-y" products="gecko" animatable="True" extra_prefixes="webkit" +<%helpers:vector_longhand name="mask-position-y" products="gecko" animation_type="normal" extra_prefixes="webkit" spec="https://drafts.fxtf.org/css-masking/#propdef-mask-position"> pub use properties::longhands::background_position_y::single_value::get_initial_value; pub use properties::longhands::background_position_y::single_value::get_initial_position_value; @@ -161,7 +161,7 @@ ${helpers.single_keyword("mask-clip", vector=True, products="gecko", extra_prefixes="webkit", - animatable=False, + animation_type="none", spec="https://drafts.fxtf.org/css-masking/#propdef-mask-clip")} ${helpers.single_keyword("mask-origin", @@ -170,10 +170,10 @@ ${helpers.single_keyword("mask-origin", vector=True, products="gecko", extra_prefixes="webkit", - animatable=False, + animation_type="none", spec="https://drafts.fxtf.org/css-masking/#propdef-mask-origin")} -<%helpers:longhand name="mask-size" products="gecko" animatable="True" extra_prefixes="webkit" +<%helpers:longhand name="mask-size" products="gecko" animation_type="normal" extra_prefixes="webkit" spec="https://drafts.fxtf.org/css-masking/#propdef-mask-size"> use properties::longhands::background_size; pub use ::properties::longhands::background_size::SpecifiedValue; @@ -195,10 +195,10 @@ ${helpers.single_keyword("mask-composite", vector=True, products="gecko", extra_prefixes="webkit", - animatable=False, + animation_type="none", spec="https://drafts.fxtf.org/css-masking/#propdef-mask-composite")} -<%helpers:vector_longhand name="mask-image" products="gecko" animatable="False" extra_prefixes="webkit" +<%helpers:vector_longhand name="mask-image" products="gecko" animation_type="none" extra_prefixes="webkit" has_uncacheable_values="${product == 'gecko'}" creates_stacking_context="True" spec="https://drafts.fxtf.org/css-masking/#propdef-mask-image"> diff --git a/components/style/properties/longhand/table.mako.rs b/components/style/properties/longhand/table.mako.rs index c145dde146c..9dfbb920d1e 100644 --- a/components/style/properties/longhand/table.mako.rs +++ b/components/style/properties/longhand/table.mako.rs @@ -7,12 +7,12 @@ <% data.new_style_struct("Table", inherited=False) %> ${helpers.single_keyword("table-layout", "auto fixed", - gecko_ffi_name="mLayoutStrategy", animatable=False, + gecko_ffi_name="mLayoutStrategy", animation_type="none", spec="https://drafts.csswg.org/css-tables/#propdef-table-layout")} <%helpers:longhand name="-x-span" products="gecko" spec="Internal-only (for `` pres attr)" - animatable="False" + animation_type="none" internal="True"> use values::HasViewportPercentage; use values::computed::ComputedValueAsSpecified; diff --git a/components/style/properties/longhand/text.mako.rs b/components/style/properties/longhand/text.mako.rs index 361ac238743..69db04020c9 100644 --- a/components/style/properties/longhand/text.mako.rs +++ b/components/style/properties/longhand/text.mako.rs @@ -12,7 +12,7 @@ Method("has_overline", "bool"), Method("has_line_through", "bool")]) %> -<%helpers:longhand name="text-overflow" animatable="False" boxed="True" +<%helpers:longhand name="text-overflow" animation_type="none" boxed="True" spec="https://drafts.csswg.org/css-ui/#propdef-text-overflow"> use std::fmt; use style_traits::ToCss; @@ -97,13 +97,13 @@ ${helpers.single_keyword("unicode-bidi", "normal embed isolate bidi-override isolate-override plaintext", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-writing-modes/#propdef-unicode-bidi")} // FIXME: This prop should be animatable. <%helpers:longhand name="text-decoration-line" custom_cascade="${product == 'servo'}" - animatable="False" + animation_type="none" spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-line"> use std::fmt; use style_traits::ToCss; @@ -219,7 +219,7 @@ ${helpers.single_keyword("unicode-bidi", ${helpers.single_keyword("text-decoration-style", "solid double dotted dashed wavy -moz-none", products="gecko", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-style")} ${helpers.predefined_type( @@ -228,11 +228,11 @@ ${helpers.predefined_type( initial_specified_value="specified::CSSColor::currentcolor()", complex_color=True, products="gecko", - animatable=True, + animation_type="normal", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color")} <%helpers:longhand name="initial-letter" - animatable="False" + animation_type="none" products="none" spec="https://drafts.csswg.org/css-inline/#sizing-drop-initials"> use std::fmt; diff --git a/components/style/properties/longhand/ui.mako.rs b/components/style/properties/longhand/ui.mako.rs index 391bb291a30..4bc32c6cc9d 100644 --- a/components/style/properties/longhand/ui.mako.rs +++ b/components/style/properties/longhand/ui.mako.rs @@ -13,7 +13,7 @@ // we should probably remove from gecko (https://bugzilla.mozilla.org/show_bug.cgi?id=1328331) ${helpers.single_keyword("ime-mode", "auto normal active disabled inactive", products="gecko", gecko_ffi_name="mIMEMode", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-ui/#input-method-editor")} ${helpers.single_keyword("-moz-user-select", "auto text none all element elements" + @@ -22,11 +22,11 @@ ${helpers.single_keyword("-moz-user-select", "auto text none all element element alias="-webkit-user-select", gecko_ffi_name="mUserSelect", gecko_enum_prefix="StyleUserSelect", - animatable=False, + animation_type="none", spec="https://drafts.csswg.org/css-ui-4/#propdef-user-select")} ${helpers.single_keyword("-moz-window-dragging", "default drag no-drag", products="gecko", gecko_ffi_name="mWindowDragging", gecko_enum_prefix="StyleWindowDragging", - animatable=False, + animation_type="none", spec="None (Nonstandard Firefox-only property)")} diff --git a/components/style/properties/longhand/xul.mako.rs b/components/style/properties/longhand/xul.mako.rs index 0d2cff04e68..2fd7c9a6e16 100644 --- a/components/style/properties/longhand/xul.mako.rs +++ b/components/style/properties/longhand/xul.mako.rs @@ -12,42 +12,42 @@ ${helpers.single_keyword("-moz-box-align", "stretch start center baseline end", products="gecko", gecko_ffi_name="mBoxAlign", gecko_enum_prefix="StyleBoxAlign", gecko_inexhaustive=True, - animatable=False, + animation_type="none", alias="-webkit-box-align", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-align)")} ${helpers.single_keyword("-moz-box-direction", "normal reverse", products="gecko", gecko_ffi_name="mBoxDirection", gecko_enum_prefix="StyleBoxDirection", - animatable=False, + animation_type="none", alias="-webkit-box-direction", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-direction)")} ${helpers.predefined_type("-moz-box-flex", "Number", "0.0", "parse_non_negative", products="gecko", gecko_ffi_name="mBoxFlex", needs_context=False, - animatable=False, + animation_type="none", alias="-webkit-box-flex", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex)")} ${helpers.single_keyword("-moz-box-orient", "horizontal vertical", products="gecko", gecko_ffi_name="mBoxOrient", gecko_enum_prefix="StyleBoxOrient", - animatable=False, + animation_type="none", alias="-webkit-box-orient", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-orient)")} ${helpers.single_keyword("-moz-box-pack", "start center end justify", products="gecko", gecko_ffi_name="mBoxPack", gecko_enum_prefix="StyleBoxPack", - animatable=False, + animation_type="none", alias="-webkit-box-pack", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-pack)")} ${helpers.single_keyword("-moz-stack-sizing", "stretch-to-fit ignore", products="gecko", gecko_ffi_name="mStretchStack", gecko_constant_prefix="NS_STYLE_STACK_SIZING", - animatable=False, + animation_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-stack-sizing)")} ${helpers.predefined_type("-moz-box-ordinal-group", "Integer", "0", @@ -56,5 +56,5 @@ ${helpers.predefined_type("-moz-box-ordinal-group", "Integer", "0", products="gecko", alias="-webkit-box-ordinal-group", gecko_ffi_name="mBoxOrdinal", - animatable=False, + animation_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-box-ordinal-group)")}