Roll IDL to multivm@1329

core/scripts/make_css_value_keywords.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 28 matching lines @@
 GPERF_TEMPLATE = """
 %%{
 %(license)s
 
 #include "config.h"
 #include "%(class_name)s.h"
 #include "core/platform/HashTools.h"
 #include <string.h>
 
 namespace WebCore {
-const char* const valueList[] = {
-"",
+static const char valueListStringPool[] = {
+"\\0"
 %(value_keyword_strings)s
-0
+};
+
+static const unsigned short valueListStringOffsets[] = {
+%(value_keyword_offsets)s
 };
 
 %%}
 %%struct-type
 struct Value;
 %%omit-struct-type
 %%language=C++
 %%readonly-tables
 %%compare-strncmp
 %%define class-name %(class_name)sHash
 %%define lookup-function-name findValueImpl
 %%define hash-function-name value_hash_function
+%%define slot-name nameOffset
 %%define word-array-name value_word_list
+%%pic
 %%enum
 %%%%
 %(value_keyword_to_enum_map)s
 %%%%
 const Value* findValue(register const char* str, register unsigned int len)
 {
     return CSSValueKeywordsHash::findValueImpl(str, len);
 }
 
 const char* getValueName(unsigned short id)
 {
     if (id >= numCSSValueKeywords || id <= 0)
         return 0;
-    return valueList[id];
+    return valueListStringPool + valueListStringOffsets[id];
 }
 
 bool isValueAllowedInMode(unsigned short id, CSSParserMode mode)
 {
     switch (id) {
         %(ua_sheet_mode_values_keywords)s
             return mode == UASheetMode;
         %(quirks_mode_values_keywords)s
             return mode == CSSQuirksMode;
         %(quirks_mode_or_ua_sheet_mode_values_keywords)s
@@ skipping 49 matching lines @@
             'class_name': self.class_name,
             'value_keyword_enums': "\n".join(enum_enties),
             'value_keywords_count': len(enum_enties),
             'max_value_keyword_length': reduce(max, map(len, map(lambda property: property['name'], self._value_keywords))),
         }
 
     def _value_keywords_with_mode(self, mode):
         return filter(lambda property: property['mode'] == mode, self._value_keywords)
 
     def generate_implementation(self):
+        keyword_offsets = [0]
+        current_offset = 1
+        for keyword in self._value_keywords:
+            keyword_offsets.append(current_offset)
+            current_offset += len(keyword["name"]) + 1
+
         gperf_input = GPERF_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
             'class_name': self.class_name,
-            'value_keyword_strings': '\n'.join(map(lambda property: '    "%(name)s",' % property, self._value_keywords)),
+            'value_keyword_strings': '\n'.join(map(lambda property: '    "%(name)s\\0"' % property, self._value_keywords)),
+            'value_keyword_offsets': '\n'.join(map(lambda offset: '  %d,' % offset, keyword_offsets)),
             'value_keyword_to_enum_map': '\n'.join(map(lambda property: '%(name)s, %(enum_name)s' % property, self._value_keywords)),
-            'ua_sheet_mode_values_keywords': '\n'.join(map(self._case_value_keyword, self._value_keywords_with_mode('UASheet'))),
-            'quirks_mode_values_keywords': '\n'.join(map(self._case_value_keyword, self._value_keywords_with_mode('Quirks'))),
-            'quirks_mode_or_ua_sheet_mode_values_keywords': '\n'.join(map(self._case_value_keyword, self._value_keywords_with_mode('QuirksOrUASheet'))),
+            'ua_sheet_mode_values_keywords': '\n        '.join(map(self._case_value_keyword, self._value_keywords_with_mode('UASheet'))),
+            'quirks_mode_values_keywords': '\n        '.join(map(self._case_value_keyword, self._value_keywords_with_mode('Quirks'))),
+            'quirks_mode_or_ua_sheet_mode_values_keywords': '\n    '.join(map(self._case_value_keyword, self._value_keywords_with_mode('QuirksOrUASheet'))),
         }
         # 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 = subprocess.Popen(gperf_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         return gperf.communicate(gperf_input)[0]
 
 
 if __name__ == "__main__":
     in_generator.Maker(CSSValueKeywordsWriter).main(sys.argv)