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

MozReview-Commit-ID: 242ms8wBDIU

layout/style/GenerateCSSPropsGenerated.py

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

layout/style/PythonCSSProps.h

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

layout/style/nsCSSPropertyID.h

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

layout/style/nsCSSProps.cpp

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

servo/components/style/properties/data.py

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