corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1452542 part 3 - Use snake_case naming for nsCSSPropertyID of alias as well. r=emilio

Browse Source 
MozReview-Commit-ID: 242ms8wBDIU
This commit is contained in:
Xidorn Quan
2018-04-11 13:44:30 +10:00
parent 7d72d24455
commit e4fac53317
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
layout/style/GenerateCSSPropsGenerated.py
View File

@@ -57,7 +57,7 @@ def generate_idl_names(properties):
def generate_assertions(properties): def generate_assertions(properties):
def enum(p): def enum(p):
if p["proptype"] is "alias": if p["proptype"] is "alias":
return "eCSSPropertyAlias_%s" % p["prop"] return "eCSSPropertyAlias_%s" % p["id"]
else: else:
return "eCSSProperty_%s" % p["id"] return "eCSSProperty_%s" % p["id"]
msg = ('static_assert(%s == %d, "GenerateCSSPropsGenerated.py did not list ' msg = ('static_assert(%s == %d, "GenerateCSSPropsGenerated.py did not list '

4
layout/style/PythonCSSProps.h
View File

@@ -28,8 +28,8 @@
#undef CSS_PROP_SHORTHAND #undef CSS_PROP_SHORTHAND
#undef CSS_PROP #undef CSS_PROP
#define CSS_PROP_ALIAS(name, aliasid_, id, method, pref) \ #define CSS_PROP_ALIAS(name, aliasid, id, method, pref) \
DO_PROP(name, method, id, 0, pref, "alias") DO_PROP(name, method, aliasid, 0, pref, "alias")
#include "nsCSSPropAliasList.h" #include "nsCSSPropAliasList.h"

2
layout/style/nsCSSPropertyID.h
View File

@@ -38,7 +38,7 @@ enum nsCSSPropertyID {
eCSSProperty_COUNT_DUMMY2 = eCSSProperty_COUNT - 1, eCSSProperty_COUNT_DUMMY2 = eCSSProperty_COUNT - 1,
#define CSS_PROP_ALIAS(aliasname_, aliasid_, id_, method_, pref_) \ #define CSS_PROP_ALIAS(aliasname_, aliasid_, id_, method_, pref_) \
eCSSPropertyAlias_##method_, eCSSPropertyAlias_##aliasid_,
#include "nsCSSPropAliasList.h" #include "nsCSSPropAliasList.h"
#undef CSS_PROP_ALIAS #undef CSS_PROP_ALIAS

2
layout/style/nsCSSProps.cpp
View File

@@ -192,7 +192,7 @@ nsCSSProps::AddRefTable(void)
#undef CSS_PROP_SHORTHAND #undef CSS_PROP_SHORTHAND
#define CSS_PROP_ALIAS(aliasname_, aliasid_, propid_, aliasmethod_, pref_) \ #define CSS_PROP_ALIAS(aliasname_, aliasid_, propid_, aliasmethod_, pref_) \
OBSERVE_PROP(pref_, eCSSPropertyAlias_##aliasmethod_) OBSERVE_PROP(pref_, eCSSPropertyAlias_##aliasid_)
#include "nsCSSPropAliasList.h" #include "nsCSSPropAliasList.h"
#undef CSS_PROP_ALIAS #undef CSS_PROP_ALIAS

2
servo/components/style/properties/data.py
View File

@@ -406,7 +406,7 @@ class Alias(object):
return self.enabled_in == "content" return self.enabled_in == "content"
def nscsspropertyid(self): def nscsspropertyid(self):
return "nsCSSPropertyID::eCSSPropertyAlias_%s" % self.camel_case return "nsCSSPropertyID::eCSSPropertyAlias_%s" % self.ident
class Method(object): class Method(object):