CSS Custom Properties (Variables)

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 11 matching lines @@
 namespace WTF {
 class AtomicString;
 class String;
 }
 
 namespace blink {
 
 enum CSSPropertyID {
     CSSPropertyInvalid = 0,
 %(property_enums)s
+    CSSPropertyVariable = %(properties_count)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);
@@ skipping 143 matching lines @@
 
     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_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,
+            'properties_count': len(self._properties) + 1,

[alancutter (OOO until 2018), 2015/08/25 01:59:08]

Add comment here stating the +1 is for CSSPropertyVariable.

[Timothy Loh, 2015/08/25 09:21:09]

Err.. this is a bit weird. numCSSProperties now accounts for CSSPropertyVariable
but it isn't in the range firstCSSProperty to lastCSSProperty. We'd be better
off just putting it as enum value 1 and updating first_enum_value.

+            'last_property_id': self._first_enum_value + len(self._properties),
             '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):
         enum_value_to_name = {property['enum_value']: property['name'] for property in self._properties_including_aliases}
         property_offsets = []
         property_names = []
         current_offset = 0
         for enum_value in range(1, max(enum_value_to_name) + 1):
@@ skipping 15 matching lines @@
         # 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)