Roll IDL to multivm@1329

core/scripts/make_css_property_names.py

 #!/usr/bin/env python
 
 import os.path
 import re
 import subprocess
 import sys
 
 from in_file import InFile
 import in_generator
 import license
@@ skipping 60 matching lines @@
 #include "config.h"
 #include "%(class_name)s.h"
 #include "core/platform/HashTools.h"
 #include <string.h>
 
 #include "wtf/ASCIICType.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
-const char* const propertyNameStrings[numCSSProperties] = {
+static const char propertyNameStringsPool[] = {
 %(property_name_strings)s
 };
 
+static const unsigned short propertyNameStringsOffsets[] = {
+%(property_name_offsets)s
+};
+
 %%}
 %%struct-type
 struct Property;
 %%omit-struct-type
 %%language=C++
 %%readonly-tables
 %%global-table
 %%compare-strncmp
 %%define class-name %(class_name)sHash
 %%define lookup-function-name findPropertyImpl
 %%define hash-function-name propery_hash_function
+%%define slot-name nameOffset
 %%define word-array-name property_wordlist
 %%enum
 %%%%
 %(property_to_enum_map)s
 %%%%
 const Property* findProperty(register const char* str, register unsigned int len)
 {
     return %(class_name)sHash::findPropertyImpl(str, len);
 }
 
 const char* getPropertyName(CSSPropertyID id)
 {
     if (id < firstCSSProperty)
         return 0;
     int index = id - firstCSSProperty;
     if (index >= numCSSProperties)
         return 0;
-    return propertyNameStrings[index];
+    return propertyNameStringsPool + propertyNameStringsOffsets[index];
 }
 
 const AtomicString& getPropertyNameAtomicString(CSSPropertyID id)
 {
     if (id < firstCSSProperty)
         return nullAtom;
     int index = id - firstCSSProperty;
     if (index >= numCSSProperties)
         return nullAtom;
 
     static AtomicString* propertyStrings = new AtomicString[numCSSProperties]; // Intentionally never destroyed.
     AtomicString& propertyString = propertyStrings[index];
     if (propertyString.isNull()) {
-        const char* propertyName = propertyNameStrings[index];
+        const char* propertyName = propertyNameStringsPool + propertyNameStringsOffsets[index];
         propertyString = AtomicString(propertyName, strlen(propertyName), AtomicString::ConstructFromLiteral);
     }
     return propertyString;
 }
 
 String getPropertyNameString(CSSPropertyID id)
 {
     // We share the StringImpl with the AtomicStrings.
     return getPropertyNameAtomicString(id).string();
 }
@@ skipping 65 matching lines @@
             'license': license.license_for_generated_cpp(),
             'class_name': self.class_name,
             'property_enums': "\n".join(map(self._enum_declaration, self._properties)),
             'first_property_id': self._first_property_id,
             'properties_count': len(self._properties),
             'last_property_id': self._first_property_id + len(self._properties) - 1,
             'max_name_length': reduce(max, map(len, map(lambda property: property['name'], self._properties))),
         }
 
     def generate_implementation(self):
+        property_offsets = []
+        current_offset = 0
+        for property in self._properties:
+            property_offsets.append(current_offset)
+            current_offset += len(property["name"]) + 1
+
         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",' % property, self._properties)),
+            'property_name_strings': '\n'.join(map(lambda property: '    "%(name)s\\0"' % property, self._properties)),
+            'property_name_offsets': '\n'.join(map(lambda offset: '    %d,' % offset, property_offsets)),
             'property_to_enum_map': '\n'.join(map(lambda property: '%(name)s, %(enum_name)s' % property, self._properties + self._aliases)),
         }
         # FIXME: If we could depend on Python 2.7, we would use subprocess.check_output
-        gperf_args = ['gperf', '--key-positions=*', '-D', '-n', '-s', '2']
+        gperf_args = ['gperf', '--key-positions=*', '-P', '-D', '-n', '-s', '2']
         gperf = subprocess.Popen(gperf_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         return gperf.communicate(gperf_input)[0]
 
 
 if __name__ == "__main__":
     in_generator.Maker(CSSPropertiesWriter).main(sys.argv)