Make UseCounters work on aliased properties

Source/build/scripts/make_css_property_names.py

 #!/usr/bin/env python
 
 import subprocess
 import sys
 
 import css_properties
 import in_generator
 import license
 
 
@@ skipping 16 matching lines @@
 namespace blink {
 
 enum CSSPropertyID {
     CSSPropertyInvalid = 0,
 %(property_enums)s
 };
 
 const int firstCSSProperty = %(first_property_id)s;
 const int numCSSProperties = %(properties_count)s;
 const int lastCSSProperty = %(last_property_id)d;
+const int lastUnresolvedCSSProperty = %(last_unresolved_property_id)d;
 const size_t maxCSSPropertyNameLength = %(max_name_length)d;
 
 const char* getPropertyName(CSSPropertyID);
 const WTF::AtomicString& getPropertyNameAtomicString(CSSPropertyID);
 WTF::String getPropertyNameString(CSSPropertyID);
 WTF::String getJSPropertyName(CSSPropertyID);
 
 inline CSSPropertyID convertToCSSPropertyID(int value)
 {
     ASSERT((value >= firstCSSProperty && value <= lastCSSProperty) || value == CSSPropertyInvalid);
     return static_cast<CSSPropertyID>(value);
 }
 
+inline CSSPropertyID resolveCSSPropertyID(CSSPropertyID id)
+{
+    return convertToCSSPropertyID(id & ~512);
+}
+
+inline bool isPropertyAlias(CSSPropertyID id) { return id & 512; }
+
 } // namespace blink
 
 namespace WTF {
 template<> struct DefaultHash<blink::CSSPropertyID> { typedef IntHash<unsigned> Hash; };
 template<> struct HashTraits<blink::CSSPropertyID> : GenericHashTraits<blink::CSSPropertyID> {
     static const bool emptyValueIsZero = true;
-    static void constructDeletedValue(blink::CSSPropertyID& slot, bool) { slot = static_cast<blink::CSSPropertyID>(blink::lastCSSProperty + 1); }
-    static bool isDeletedValue(blink::CSSPropertyID value) { return value == (blink::lastCSSProperty + 1); }
+    static void constructDeletedValue(blink::CSSPropertyID& slot, bool) { slot = static_cast<blink::CSSPropertyID>(blink::lastUnresolvedCSSProperty + 1); }
+    static bool isDeletedValue(blink::CSSPropertyID value) { return value == (blink::lastUnresolvedCSSProperty + 1); }
 };
 }
 
 #endif // %(class_name)s_h
 """
 
 GPERF_TEMPLATE = """
 %%{
 %(license)s
 
@@ skipping 105 matching lines @@
                          (self.class_name + ".cpp"): self.generate_implementation,
                         }
 
     def _enum_declaration(self, property):
         return "    %(property_id)s = %(enum_value)s," % property
 
     def generate_header(self):
         return HEADER_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
             'class_name': self.class_name,
-            'property_enums': "\n".join(map(self._enum_declaration, self._properties_list)),
+            'property_enums': "\n".join(map(self._enum_declaration, self._properties_including_aliases)),
             'first_property_id': self._first_enum_value,
             'properties_count': len(self._properties),
             'last_property_id': self._first_enum_value + len(self._properties) - 1,
+            'last_unresolved_property_id': max(property["enum_value"] for property in self._properties_including_aliases),
             'max_name_length': max(map(len, self._properties)),
         }
 
     def generate_implementation(self):
         property_offsets = []
         current_offset = 0
-        for property in self._properties_list:
+        for property in self._properties_including_aliases:
             property_offsets.append(current_offset)
             current_offset += len(property["name"]) + 1
 
-        css_name_and_enum_pairs = [(property['name'], property_id) for property_id, property in self._properties.items()]
-        for name, aliased_name in self._aliases.items():
-            css_name_and_enum_pairs.append((name, css_properties.css_name_to_enum(aliased_name)))
+        css_name_and_enum_pairs = [(property['name'], property['property_id']) for property in self._properties_including_aliases]
 
         gperf_input = GPERF_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
             'class_name': self.class_name,
-            'property_name_strings': '\n'.join(map(lambda property: '    "%(name)s\\0"' % property, self._properties_list)),
+            'property_name_strings': '\n'.join(map(lambda property: '    "%(name)s\\0"' % property, self._properties_including_aliases)),
             'property_name_offsets': '\n'.join(map(lambda offset: '    %d,' % offset, property_offsets)),
             'property_to_enum_map': '\n'.join(map(lambda property: '%s, %s' % property, css_name_and_enum_pairs)),
         }
         # FIXME: If we could depend on Python 2.7, we would use subprocess.check_output
         gperf_args = [self.gperf_path, '--key-positions=*', '-P', '-n']
         gperf_args.extend(['-m', '50'])  # Pick best of 50 attempts.
         gperf_args.append('-D')  # Allow duplicate hashes -> More compact code.
         gperf = subprocess.Popen(gperf_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
         return gperf.communicate(gperf_input)[0]
 
 
 if __name__ == "__main__":
     in_generator.Maker(CSSPropertyNamesWriter).main(sys.argv)