From a0c6628cf21db0e086603adbc1b1df98e44052f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Thu, 25 Feb 2021 18:05:08 +0000 Subject: [PATCH] Miscellaneous rebase fixes. --- components/style/properties/data.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/components/style/properties/data.py b/components/style/properties/data.py index 714e3ced604..4fe90fb560b 100644 --- a/components/style/properties/data.py +++ b/components/style/properties/data.py @@ -335,19 +335,14 @@ class Longhand(Property): assert ( has_effect_on_gecko_scrollbars in [None, False, True] and not style_struct.inherited - or (gecko_pref is None) == (has_effect_on_gecko_scrollbars is None)), ( - "Property " + name + ": has_effect_on_gecko_scrollbars must be " - "specified, and must have a value of True or False, iff a " - "property is inherited and is behind a Gecko pref") - # For enabled_in, the setup is as follows: - # It needs to be one of the four values: ["", "ua", "chrome", "content"] - # * "chrome" implies "ua", and implies that they're explicitly - # enabled. - # * "" implies the property will never be parsed. - # * "content" implies the property is accessible unconditionally, - # modulo a pref, set via servo_pref / gecko_pref. - assert enabled_in in ["", "ua", "chrome", "content"] - self.enabled_in = enabled_in + or (gecko_pref is None) == (has_effect_on_gecko_scrollbars is None) + ), ( + "Property " + + name + + ": has_effect_on_gecko_scrollbars must be " + + "specified, and must have a value of True or False, iff a " + + "property is inherited and is behind a Gecko pref" + ) self.need_index = need_index self.gecko_ffi_name = gecko_ffi_name or "m" + self.camel_case self.cast_type = cast_type