From aa0fe64a0dedec28514a7984e2dce68746a1e49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sun, 17 Sep 2017 01:26:12 +0200 Subject: [PATCH] style: Remove unused extra_servo_aliases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emilio Cobos Álvarez --- components/style/properties/data.py | 10 ++-------- components/style/properties/helpers.mako.rs | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/components/style/properties/data.py b/components/style/properties/data.py index 528119cff26..2ba16b710e8 100644 --- a/components/style/properties/data.py +++ b/components/style/properties/data.py @@ -64,7 +64,7 @@ class Keyword(object): gecko_enum_prefix=None, custom_consts=None, extra_gecko_values=None, extra_servo_values=None, aliases=None, - extra_gecko_aliases=None, extra_servo_aliases=None, + extra_gecko_aliases=None, gecko_strip_moz_prefix=None, gecko_inexhaustive=None): self.name = name @@ -78,7 +78,6 @@ class Keyword(object): self.extra_servo_values = (extra_servo_values or "").split() self.aliases = parse_aliases(aliases or "") self.extra_gecko_aliases = parse_aliases(extra_gecko_aliases or "") - self.extra_servo_aliases = parse_aliases(extra_servo_aliases or "") self.consts_map = {} if custom_consts is None else custom_consts self.gecko_strip_moz_prefix = True \ if gecko_strip_moz_prefix is None else gecko_strip_moz_prefix @@ -95,11 +94,6 @@ class Keyword(object): aliases.update(self.extra_gecko_aliases) return aliases - def servo_aliases(self): - aliases = self.aliases.copy() - aliases.update(self.extra_servo_aliases) - return aliases - def values_for(self, product): if product == "gecko": return self.gecko_values() @@ -112,7 +106,7 @@ class Keyword(object): if product == "gecko": return self.gecko_aliases() elif product == "servo": - return self.servo_aliases() + return self.aliases else: raise Exception("Bad product: " + product) diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs index 95d60898c0b..b2182d3842a 100644 --- a/components/style/properties/helpers.mako.rs +++ b/components/style/properties/helpers.mako.rs @@ -617,8 +617,8 @@ keyword_kwargs = {a: kwargs.pop(a, None) for a in [ 'gecko_constant_prefix', 'gecko_enum_prefix', 'extra_gecko_values', 'extra_servo_values', - 'aliases', 'extra_gecko_aliases', 'extra_servo_aliases', - 'custom_consts', 'gecko_inexhaustive', 'gecko_strip_moz_prefix', + 'aliases', 'extra_gecko_aliases', 'custom_consts', + 'gecko_inexhaustive', 'gecko_strip_moz_prefix', ]} %>