Merge CSSProperties.in and CSSShorthands.in

Source/devtools/scripts/generate_supported_css.py

Index: Source/devtools/scripts/generate_supported_css.py
diff --git a/Source/devtools/scripts/generate_supported_css.py b/Source/devtools/scripts/generate_supported_css.py
index 2883c943332d2495aa4524c54279cd215a7ae724..07933f4364c1b709d66cb2550032434be8febc3f 100755
--- a/Source/devtools/scripts/generate_supported_css.py
+++ b/Source/devtools/scripts/generate_supported_css.py
@@ -59,14 +59,12 @@ def fillCSSShorthandsFromFile(fileName):
         lines = f.readlines()
     lines = filterCommentsAndEmptyLines(lines)
     for line in lines:
-        # Every line is:
-        #  <property-name>[ longhands=<longhand 1>;<longhand 2>;<longhand 3>,runtimeEnabledShorthand=<runtime flag name>]
-        # There might be a runtime flag declaration at the end of the list followed by a comma.
-        if "," in line:
-            line = line[:line.index(",")]
-        shorthand = line[:line.index(" ")]
-        longhands = line[line.index("=") + 1:].split(";")
-        cssProperties[shorthand] = longhands
+        # Format for shorthands is:
+        #  <property-name>[ longhands=<longhand 1>;<longhand 2>;<longhand 3>]
+        shorthand = line.partition(" ")[0]
+        longhands = line.partition("longhands=")[2]

[lushnikov, 2014/07/24 08:08:35]

I've just found the following in CSSProperties.in:

flood-color svg, sb_converter=convertSVGColor

Which implies that longhands are not always the third part of the string.

[Timothy Loh, 2014/07/24 08:27:43]

The way str.partition works means that the |longhands| variable will be empty
here if "longhands=" isn't present in the line.

[lushnikov, 2014/07/24 09:26:30]

My bad.
One more thing: this relies on "longhands" being the last property argument in
CSSProperties.in, however this condition is not explicitly stated in
CSSProperties.h

Should we better use line.partition("longhands=")[2].partition(", ")[0] to be on
the safe side here?

[Timothy Loh, 2014/07/25 03:36:47]

Sure, done. FYI the followup patch https://codereview.chromium.org/415613002/
basically rewrites the file (since it will then only need to read one file) if
you haven't seen it.

+        if longhands:
+            cssProperties[shorthand] = longhands.split(";")
 
 fillPropertiesFromFile(sys.argv[1])
 fillPropertiesFromFile(sys.argv[2])