Skip to content

Commit 1b610a0

Browse files
committed
Backed out 7 changesets (bug 1452542) for failing toolkit/content/tests/chrome/test_arrowpanel.xul on a CLOSED TREE
Backed out changeset f206acff283f (bug 1452542) Backed out changeset be97e652391f (bug 1452542) Backed out changeset 4d3a028edaed (bug 1452542) Backed out changeset 5619bba37cdd (bug 1452542) Backed out changeset e83a797bdc61 (bug 1452542) Backed out changeset 255e2feff19f (bug 1452542) Backed out changeset fac55b1a0706 (bug 1452542)
1 parent 6203137 commit 1b610a0

24 files changed

+718
-881
lines changed

config/recurse.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ widget/android/bindings/export: build/annotationProcessors/export
171171
# .xpt generation needs the xpidl lex/yacc files
172172
xpcom/xpidl/export: xpcom/idl-parser/xpidl/export
173173

174-
# CSS2Properties.webidl needs ServoCSSPropList.py from layout/style
175-
dom/bindings/export: layout/style/export
176-
177174
ifdef ENABLE_CLANG_PLUGIN
178175
$(filter-out config/host build/unix/stdc++compat/% build/clang-plugin/%,$(compile_targets)): build/clang-plugin/target build/clang-plugin/tests/target
179176
build/clang-plugin/tests/target: build/clang-plugin/target

devtools/shared/css/generated/mach_commands.py

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,32 @@ def generate_css_db(self):
5050

5151
def get_preferences(self):
5252
"""Get all of the preferences associated with enabling and disabling a property."""
53-
# The data takes the following form:
53+
# Build the command to run the preprocessor on PythonCSSProps.h
54+
headerPath = resolve_path(self.topsrcdir, 'layout/style/PythonCSSProps.h')
55+
56+
cpp = self.substs['CPP']
57+
58+
if not cpp:
59+
print("Unable to find the cpp program. Please do a full, nonartifact")
60+
print("build and try this again.")
61+
sys.exit(1)
62+
63+
if type(cpp) is list:
64+
cmd = cpp
65+
else:
66+
cmd = shellutil.split(cpp)
67+
cmd += shellutil.split(self.substs['ACDEFINES'])
68+
cmd.append(headerPath)
69+
70+
# The preprocessed list takes the following form:
5471
# [ (name, prop, id, flags, pref, proptype), ... ]
55-
dataPath = resolve_path(self.topobjdir, 'layout/style/ServoCSSPropList.py')
56-
with open(dataPath, "r") as f:
57-
data = eval(f.read())
72+
preprocessed = eval(subprocess.check_output(cmd))
5873

5974
# Map this list
6075
# (name, prop, id, flags, pref, proptype) => (name, pref)
6176
preferences = [
6277
(name, pref)
63-
for name, prop, id, flags, pref, proptype in data
78+
for name, prop, id, flags, pref, proptype in preprocessed
6479
if 'CSS_PROPERTY_INTERNAL' not in flags and pref]
6580

6681
return preferences

0 commit comments

Comments
 (0)