Auto merge of #20657 - emilio:gecko-sync, r=emilio

style: Sync changes from mozilla-central.

See each individual commit from details.
This commit is contained in:
bors-servo 2018-04-17 14:06:08 -04:00 committed by GitHub
commit 087bd20b6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 329 additions and 98 deletions

View file

@ -311,10 +311,7 @@ class Longhand(object):
return "<{} as ToAnimatedValue>::AnimatedValue".format(computed)
def nscsspropertyid(self):
ident = self.ident
if ident == "float":
ident = "float_"
return "nsCSSPropertyID::eCSSProperty_%s" % ident
return "nsCSSPropertyID::eCSSProperty_%s" % self.ident
class Shorthand(object):