Bug 1471114 part 1 - Move CSSPropFlags prefix generation into GenerateServoCSSPropList.py. r=emilio

MozReview-Commit-ID: E5dl9V2B2dq

--HG--
extra : source : 6e2448ce3f4d9965749298a575795dfab926b9cb

Author: upsuper

dom/bindings/GenerateCSS2PropertiesWebIDL.py

@@ -17,7 +17,7 @@ def generate(output, idlFilename, dataFile):
     propList = runpy.run_path(dataFile)["data"]
     props = ""
     for p in propList:
-        if "CSSPropFlags::Internal" in p.flags:
+        if "Internal" in p.flags:
             continue
         # Unfortunately, even some of the getters here are fallible
         # (e.g. on nsComputedDOMStyle).

layout/style/GenerateCSSPropsGenerated.py

@@ -13,7 +13,7 @@ class PropertyWrapper(object):
     def __init__(self, index, prop):
         self.index = index
         self.prop = prop
-        if "CSSPropFlags::Internal" in prop.flags:
+        if "Internal" in prop.flags:
             self.idlname = None
         else:
             idl_name = prop.method

layout/style/GenerateServoCSSPropList.py

@@ -69,7 +69,7 @@ def generate_header(output, data):
         "alias": "CSS_PROP_ALIAS",
     }
     for prop in data:
-        is_internal = "CSSPropFlags::Internal" in prop.flags
+        is_internal = "Internal" in prop.flags
         pref = '"' + prop.pref + '"'
         if prop.type() == "alias":
             params = [prop.name, prop.alias_id, prop.prop_id, prop.method, pref]
@@ -80,7 +80,8 @@ def generate_header(output, data):
             elif method.startswith("Moz"):
                 method = "CSS_PROP_DOMPROP_PREFIXED({})".format(method[3:])
             if prop.flags:
-                flags = " | ".join(prop.flags)
+                flags = " | ".join("CSSPropFlags::{}".format(flag)
+                                   for flag in prop.flags)
             else:
                 flags = "CSSPropFlags(0)"
             params = [prop.name, prop.id, method, flags, pref]

layout/style/ServoCSSPropList.mako.py

@@ -113,7 +113,7 @@ def flags(prop):
         result.append("CanAnimateOnCompositor")
     if serialized_by_servo(prop):
         result.append("SerializedByServo")
-    return ", ".join('"CSSPropFlags::{}"'.format(flag) for flag in result)
+    return ", ".join('"{}"'.format(flag) for flag in result)
 
 def pref(prop):
     if prop.gecko_pref: