Merge CSSProperties.in and CSSShorthands.in

Source/devtools/scripts/generate_supported_css.py

 #!/usr/bin/env python
 # Copyright (c) 2014 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
     for line in lines:
         if not "alias_for" in line:
             cssProperties[line] = []
 
 
 def fillCSSShorthandsFromFile(fileName):
     with open(fileName, "r") as f:
         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])
 fillCSSShorthandsFromFile(sys.argv[3])
 
 # Reformat from map into list.
 reformat = []
 for name, longhands in cssProperties.items():
     entry = {"name": name}
     if len(longhands) > 0:
         entry["longhands"] = longhands
     reformat.append(entry)
 
 with open(sys.argv[4], "w") as f:
     f.write("WebInspector.CSSMetadata.initializeWithSupportedProperties(%s);" % json.dumps(reformat))