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..2ddfef7839ad06dc5b2f4da56be8d0bcb94d1fa6 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]

[apavlov, 2014/07/25 12:13:23]

could we put this line under "if longhands:" to avoid necessary computations?

[Timothy Loh, 2014/07/28 02:54:19]

Probably, but this file is rewritten in the next patch so I won't bother here.

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