diff options
7 files changed, 14 insertions, 21 deletions
diff --git a/components/style/properties/data.py b/components/style/properties/data.py index 06735ef888b..15d9f2fc89a 100644 --- a/components/style/properties/data.py +++ b/components/style/properties/data.py @@ -148,7 +148,7 @@ class Longhand(object): def __init__(self, style_struct, name, spec=None, animation_value_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', + allowed_in_keyframe_block=True, cast_type='u8', has_uncacheable_values=False, logical=False, alias=None, extra_prefixes=None, boxed=False, flags=None, allowed_in_page_rule=False, allow_quirks=False, ignored_when_colors_disabled=False, vector=False): @@ -169,7 +169,6 @@ class Longhand(object): self.gecko_ffi_name = gecko_ffi_name or "m" + self.camel_case self.depend_on_viewport_size = depend_on_viewport_size self.derived_from = (derived_from or "").split() - self.complex_color = complex_color self.cast_type = cast_type self.logical = arg_to_bool(logical) self.alias = alias.split() if alias else [] diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 721598b66f9..1f64cf99daf 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -315,7 +315,7 @@ def set_gecko_property(ffi_name, expr): } </%def> -<%def name="impl_color_setter(ident, gecko_ffi_name, complex_color=True)"> +<%def name="impl_color_setter(ident, gecko_ffi_name)"> #[allow(unreachable_code)] #[allow(non_snake_case)] pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) { @@ -323,7 +323,7 @@ def set_gecko_property(ffi_name, expr): } </%def> -<%def name="impl_color_copy(ident, gecko_ffi_name, complex_color=True)"> +<%def name="impl_color_copy(ident, gecko_ffi_name)"> #[allow(non_snake_case)] pub fn copy_${ident}_from(&mut self, other: &Self) { let color = ${get_gecko_property(gecko_ffi_name, self_param = "other")}; @@ -331,7 +331,7 @@ def set_gecko_property(ffi_name, expr): } </%def> -<%def name="impl_color_clone(ident, gecko_ffi_name, complex_color=True)"> +<%def name="impl_color_clone(ident, gecko_ffi_name)"> #[allow(non_snake_case)] pub fn clone_${ident}(&self) -> longhands::${ident}::computed_value::T { ${get_gecko_property(gecko_ffi_name)}.into() @@ -386,11 +386,11 @@ def set_gecko_property(ffi_name, expr): % endif </%def> -<%def name="impl_color(ident, gecko_ffi_name, need_clone=False, complex_color=True)"> -<%call expr="impl_color_setter(ident, gecko_ffi_name, complex_color)"></%call> -<%call expr="impl_color_copy(ident, gecko_ffi_name, complex_color)"></%call> +<%def name="impl_color(ident, gecko_ffi_name, need_clone=False)"> +<%call expr="impl_color_setter(ident, gecko_ffi_name)"></%call> +<%call expr="impl_color_copy(ident, gecko_ffi_name)"></%call> % if need_clone: - <%call expr="impl_color_clone(ident, gecko_ffi_name, complex_color)"></%call> + <%call expr="impl_color_clone(ident, gecko_ffi_name)"></%call> % endif </%def> @@ -408,7 +408,7 @@ def set_gecko_property(ffi_name, expr): % endif </%def> -<%def name="impl_svg_paint(ident, gecko_ffi_name, need_clone=False, complex_color=True)"> +<%def name="impl_svg_paint(ident, gecko_ffi_name, need_clone=False)"> #[allow(non_snake_case)] pub fn set_${ident}(&mut self, mut v: longhands::${ident}::computed_value::T) { use values::generics::SVGPaintKind; diff --git a/components/style/properties/longhand/background.mako.rs b/components/style/properties/longhand/background.mako.rs index 273fc43eac5..3b2a2e6760f 100644 --- a/components/style/properties/longhand/background.mako.rs +++ b/components/style/properties/longhand/background.mako.rs @@ -11,7 +11,6 @@ ${helpers.predefined_type("background-color", "Color", initial_specified_value="SpecifiedValue::transparent()", spec="https://drafts.csswg.org/css-backgrounds/#background-color", animation_value_type="IntermediateColor", - complex_color=True, ignored_when_colors_disabled=True, allow_quirks=True)} diff --git a/components/style/properties/longhand/column.mako.rs b/components/style/properties/longhand/column.mako.rs index 5b7ea05073d..56d481b719d 100644 --- a/components/style/properties/longhand/column.mako.rs +++ b/components/style/properties/longhand/column.mako.rs @@ -55,8 +55,7 @@ ${helpers.predefined_type("column-rule-color", "Color", "::cssparser::Color::CurrentColor", initial_specified_value="specified::Color::currentcolor()", products="gecko", animation_value_type="IntermediateColor", extra_prefixes="moz", - complex_color=True, need_clone=True, - ignored_when_colors_disabled=True, + need_clone=True, ignored_when_colors_disabled=True, spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-color")} ${helpers.single_keyword("column-span", "none all", diff --git a/components/style/properties/longhand/inherited_text.mako.rs b/components/style/properties/longhand/inherited_text.mako.rs index 2e0b9cd0d39..a8f055663c2 100644 --- a/components/style/properties/longhand/inherited_text.mako.rs +++ b/components/style/properties/longhand/inherited_text.mako.rs @@ -689,8 +689,7 @@ ${helpers.predefined_type("text-emphasis-color", "Color", "::cssparser::Color::CurrentColor", initial_specified_value="specified::Color::currentcolor()", products="gecko", animation_value_type="IntermediateColor", - complex_color=True, need_clone=True, - ignored_when_colors_disabled=True, + need_clone=True, ignored_when_colors_disabled=True, spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-color")} @@ -708,8 +707,7 @@ ${helpers.predefined_type( "-webkit-text-fill-color", "Color", "CSSParserColor::CurrentColor", products="gecko", animation_value_type="IntermediateColor", - complex_color=True, need_clone=True, - ignored_when_colors_disabled=True, + need_clone=True, ignored_when_colors_disabled=True, spec="https://compat.spec.whatwg.org/#the-webkit-text-fill-color")} ${helpers.predefined_type( @@ -717,8 +715,7 @@ ${helpers.predefined_type( "CSSParserColor::CurrentColor", initial_specified_value="specified::Color::currentcolor()", products="gecko", animation_value_type="IntermediateColor", - complex_color=True, need_clone=True, - ignored_when_colors_disabled=True, + need_clone=True, ignored_when_colors_disabled=True, spec="https://compat.spec.whatwg.org/#the-webkit-text-stroke-color")} ${helpers.predefined_type("-webkit-text-stroke-width", diff --git a/components/style/properties/longhand/outline.mako.rs b/components/style/properties/longhand/outline.mako.rs index 51a0aea350e..ec08fa43972 100644 --- a/components/style/properties/longhand/outline.mako.rs +++ b/components/style/properties/longhand/outline.mako.rs @@ -12,7 +12,7 @@ // TODO(pcwalton): `invert` ${helpers.predefined_type("outline-color", "Color", "computed::Color::CurrentColor", initial_specified_value="specified::Color::currentcolor()", - animation_value_type="IntermediateColor", complex_color=True, need_clone=True, + animation_value_type="IntermediateColor", need_clone=True, ignored_when_colors_disabled=True, spec="https://drafts.csswg.org/css-ui/#propdef-outline-color")} diff --git a/components/style/properties/longhand/text.mako.rs b/components/style/properties/longhand/text.mako.rs index 04af1b35924..c4bbe26c0e5 100644 --- a/components/style/properties/longhand/text.mako.rs +++ b/components/style/properties/longhand/text.mako.rs @@ -281,7 +281,6 @@ ${helpers.predefined_type( "text-decoration-color", "Color", "computed::Color::CurrentColor", initial_specified_value="specified::Color::currentcolor()", - complex_color=True, products="gecko", animation_value_type="IntermediateColor", ignored_when_colors_disabled=True, |