Bug 1452542 part 6 - Replace uses of PythonCSSProps.h with the data file generated from Servo. r=froydnj

Some content in Makefile.in is removed because after this change, the
scripts no longer invoke the preprocessor and thus don't have unknown
dependencies anymore outside what is provided in their inputs array.

The order of exports.PREFERENCES in properties-db changes because the
data file has shorthands placed after longhands. The only usage of it
is in test_css-properties-db.js which doesn't care about the order.

MozReview-Commit-ID: AMjzTRf2HYN

--HG--
extra : rebase_source : f9db0659a81bea28b335806ac70e23dc0d36e493

Author: upsuper

config/recurse.mk

@@ -171,6 +171,9 @@ widget/android/bindings/export: build/annotationProcessors/export
 # .xpt generation needs the xpidl lex/yacc files
 xpcom/xpidl/export: xpcom/idl-parser/xpidl/export
 
+# CSS2Properties.webidl needs ServoCSSPropList.py from layout/style
+dom/bindings/export: layout/style/export
+
 ifdef ENABLE_CLANG_PLUGIN
 $(filter-out config/host build/unix/stdc++compat/% build/clang-plugin/%,$(compile_targets)): build/clang-plugin/target build/clang-plugin/tests/target
 build/clang-plugin/tests/target: build/clang-plugin/target

devtools/shared/css/generated/mach_commands.py

@@ -50,32 +50,17 @@ def generate_css_db(self):
 
     def get_preferences(self):
         """Get all of the preferences associated with enabling and disabling a property."""
-        # Build the command to run the preprocessor on PythonCSSProps.h
-        headerPath = resolve_path(self.topsrcdir, 'layout/style/PythonCSSProps.h')
-
-        cpp = self.substs['CPP']
-
-        if not cpp:
-            print("Unable to find the cpp program. Please do a full, nonartifact")
-            print("build and try this again.")
-            sys.exit(1)
-
-        if type(cpp) is list:
-            cmd = cpp
-        else:
-            cmd = shellutil.split(cpp)
-        cmd += shellutil.split(self.substs['ACDEFINES'])
-        cmd.append(headerPath)
-
-        # The preprocessed list takes the following form:
+        # The data takes the following form:
         # [ (name, prop, id, flags, pref, proptype), ... ]
-        preprocessed = eval(subprocess.check_output(cmd))
+        dataPath = resolve_path(self.topobjdir, 'layout/style/ServoCSSPropList.py')
+        with open(dataPath, "r") as f:
+            data = eval(f.read())
 
         # Map this list
         # (name, prop, id, flags, pref, proptype) => (name, pref)
         preferences = [
             (name, pref)
-            for name, prop, id, flags, pref, proptype in preprocessed
+            for name, prop, id, flags, pref, proptype in data
             if 'CSS_PROPERTY_INTERNAL' not in flags and pref]
 
         return preferences

devtools/shared/css/generated/properties-db.js

@@ -9433,10 +9433,6 @@ exports.PSEUDO_ELEMENTS = [
  * exposed for testing purposes.
  */
 exports.PREFERENCES = [
-  [
-    "all",
-    "layout.css.all-shorthand.enabled"
-  ],
   [
     "background-blend-mode",
     "layout.css.background-blend-mode.enabled"
@@ -9485,10 +9481,6 @@ exports.PREFERENCES = [
     "-moz-osx-font-smoothing",
     "layout.css.osx-font-smoothing.enabled"
   ],
-  [
-    "overflow-clip-box",
-    "layout.css.overflow-clip-box.enabled"
-  ],
   [
     "overflow-clip-box-block",
     "layout.css.overflow-clip-box.enabled"
@@ -9497,10 +9489,6 @@ exports.PREFERENCES = [
     "overflow-clip-box-inline",
     "layout.css.overflow-clip-box.enabled"
   ],
-  [
-    "overscroll-behavior",
-    "layout.css.overscroll-behavior.enabled"
-  ],
   [
     "overscroll-behavior-x",
     "layout.css.overscroll-behavior.enabled"
@@ -9537,10 +9525,6 @@ exports.PREFERENCES = [
     "scroll-snap-points-y",
     "layout.css.scroll-snap.enabled"
   ],
-  [
-    "scroll-snap-type",
-    "layout.css.scroll-snap.enabled"
-  ],
   [
     "scroll-snap-type-x",
     "layout.css.scroll-snap.enabled"
@@ -9569,10 +9553,6 @@ exports.PREFERENCES = [
     "text-justify",
     "layout.css.text-justify.enabled"
   ],
-  [
-    "-webkit-text-stroke",
-    "layout.css.prefixes.webkit"
-  ],
   [
     "-webkit-text-stroke-color",
     "layout.css.prefixes.webkit"
@@ -9593,6 +9573,26 @@ exports.PREFERENCES = [
     "translate",
     "layout.css.individual-transform.enabled"
   ],
+  [
+    "all",
+    "layout.css.all-shorthand.enabled"
+  ],
+  [
+    "overflow-clip-box",
+    "layout.css.overflow-clip-box.enabled"
+  ],
+  [
+    "overscroll-behavior",
+    "layout.css.overscroll-behavior.enabled"
+  ],
+  [
+    "scroll-snap-type",
+    "layout.css.scroll-snap.enabled"
+  ],
+  [
+    "-webkit-text-stroke",
+    "layout.css.prefixes.webkit"
+  ],
   [
     "-moz-animation",
     "layout.css.prefixes.animations"

dom/bindings/GenerateCSS2PropertiesWebIDL.py

@@ -5,25 +5,18 @@
 import sys
 import string
 import argparse
-import subprocess
-import buildconfig
-from mozbuild import shellutil
 
 # Generates a line of WebIDL with the given spelling of the property name
 # (whether camelCase, _underscorePrefixed, etc.) and the given array of
 # extended attributes.
 def generateLine(propName, extendedAttrs):
     return "  [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
                                                  propName)
-def generate(output, idlFilename, preprocessorHeader):
-    cpp = list(buildconfig.substs['CPP'])
-    cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
-    cpp.append(preprocessorHeader)
-    preprocessed = subprocess.check_output(cpp)
-
-    propList = eval(preprocessed)
+def generate(output, idlFilename, dataFile):
+    with open(dataFile, "r") as f:
+        propList = eval(f.read())
     props = ""
-    for [name, prop, id, flags, pref, proptype] in propList:
+    for name, prop, id, flags, pref, proptype in propList:
         if "CSS_PROPERTY_INTERNAL" in flags:
             continue
         # Unfortunately, even some of the getters here are fallible

dom/bindings/Makefile.in

@@ -15,19 +15,6 @@ CPPSRCS += $(globalgen_sources) $(unified_binding_cpp_files)
 
 include $(topsrcdir)/config/rules.mk
 
-# TODO This list should be emitted to a .pp file via
-# GenerateCSS2PropertiesWebIDL.py (bug 1281614)
-css2properties_dependencies = \
-  $(topsrcdir)/layout/style/nsCSSPropList.h \
-  $(topsrcdir)/layout/style/nsCSSPropAliasList.h \
-  $(webidl_base)/CSS2Properties.webidl.in \
-  $(topsrcdir)/layout/style/PythonCSSProps.h \
-  $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
-  $(GLOBAL_DEPS) \
-  $(NULL)
-
-CSS2Properties.webidl: $(css2properties_dependencies)
-
 # Most of the logic for dependencies lives inside Python so it can be
 # used by multiple build backends. We simply have rules to generate
 # and include the .pp file.

dom/bindings/moz.build

@@ -179,5 +179,5 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     css_props.script = 'GenerateCSS2PropertiesWebIDL.py:generate'
     css_props.inputs = [
         '/dom/webidl/CSS2Properties.webidl.in',
-        '/layout/style/PythonCSSProps.h',
+        '!/layout/style/ServoCSSPropList.py',
     ]

layout/style/GenerateCSSPropsGenerated.py

@@ -5,18 +5,13 @@
 import sys
 import string
 import argparse
-import subprocess
-import buildconfig
-from mozbuild import shellutil
-
-def get_properties(preprocessorHeader):
-    cpp = list(buildconfig.substs['CPP'])
-    cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
-    cpp.append(preprocessorHeader)
-    preprocessed = subprocess.check_output(cpp)
+
+def get_properties(dataFile):
+    with open(dataFile, "r") as f:
+        properties = eval(f.read())
     properties = [{"name":p[0], "prop":p[1], "id":p[2],
                    "flags":p[3], "pref":p[4], "proptype":p[5]}
-                  for (i, p) in enumerate(eval(preprocessed))]
+                  for (i, p) in enumerate(properties)]
 
     # Sort the list so that longhand properties are intermingled first,
     # shorthand properties follow, then aliases appear last.
@@ -57,7 +52,7 @@ def generate_idl_names(properties):
 def generate_assertions(properties):
     def enum(p):
         if p["proptype"] is "alias":
-            return "eCSSPropertyAlias_%s" % p["id"]
+            return "eCSSPropertyAlias_%s" % p["id"][0]
         else:
             return "eCSSProperty_%s" % p["id"]
     msg = ('static_assert(%s == %d, "GenerateCSSPropsGenerated.py did not list '
@@ -79,12 +74,12 @@ def generate_idl_name_positions(properties):
 
     return ",\n".join(map(lambda (p, position): "  %d" % position, ps))
 
-def generate(output, cppTemplate, preprocessorHeader):
+def generate(output, cppTemplate, dataFile):
     cppFile = open(cppTemplate, "r")
     cppTemplate = cppFile.read()
     cppFile.close()
 
-    properties = get_properties(preprocessorHeader)
+    properties = get_properties(dataFile)
     substitutions = {
         "idl_names": generate_idl_names(properties),
         "assertions": generate_assertions(properties),

layout/style/Makefile.in

@@ -301,7 +301,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     css_props.script = 'GenerateCSSPropsGenerated.py:generate'
     css_props.inputs = [
         'nsCSSPropsGenerated.inc.in',
-        'PythonCSSProps.h',
+        '!ServoCSSPropList.py',
     ]
 
     CONFIGURE_SUBST_FILES += [