Revert of Enable -Wdeprecated-register (except on CrOS).

third_party/WebKit/Source/build/scripts/make_css_value_keywords.py

 #!/usr/bin/env python
 
 import os.path
 import re
 import subprocess
 import sys
 
 from name_utilities import enum_for_css_keyword
 from name_utilities import upper_first_letter
 import json5_generator
@@ skipping 34 matching lines @@
 #include "core/css/HashTools.h"
 #include <string.h>
 
 #ifdef _MSC_VER
 // Disable the warnings from casting a 64-bit pointer to 32-bit long
 // warning C4302: 'type cast': truncation from 'char (*)[28]' to 'long'
 // warning C4311: 'type cast': pointer truncation from 'char (*)[18]' to 'long'
 #pragma warning(disable : 4302 4311)
 #endif
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-// TODO(thakis): Remove once we use a gperf that no longer produces "register".
-#pragma clang diagnostic ignored "-Wdeprecated-register"
-#endif
-
 namespace blink {
 static const char valueListStringPool[] = {
 %(value_keyword_strings)s
 };
 
 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
 %%%%
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-const Value* findValue(const char* str, unsigned int len) {
-  return CSSValueKeywordsHash::findValueImpl(str, len);
+const Value* findValue(register const char* str, register unsigned int len)
+{
+    return CSSValueKeywordsHash::findValueImpl(str, len);
 }
 
-const char* getValueName(CSSValueID id) {
-  ASSERT(id > 0 && id < numCSSValueKeywords);
-  return valueListStringPool + valueListStringOffsets[id - 1];
+const char* getValueName(CSSValueID id)
+{
+    ASSERT(id > 0 && id < numCSSValueKeywords);
+    return valueListStringPool + valueListStringOffsets[id - 1];
 }
 
-bool isValueAllowedInMode(unsigned short id, CSSParserMode mode) {
-  switch (id) {
-    %(ua_sheet_mode_values_keywords)s
-      return isUASheetBehavior(mode);
-    %(quirks_mode_or_ua_sheet_mode_values_keywords)s
-      return isUASheetBehavior(mode) || isQuirksModeBehavior(mode);
-    default:
-      return true;
-  }
+bool isValueAllowedInMode(unsigned short id, CSSParserMode mode)
+{
+    switch (id) {
+        %(ua_sheet_mode_values_keywords)s
+            return isUASheetBehavior(mode);
+        %(quirks_mode_or_ua_sheet_mode_values_keywords)s
+            return isUASheetBehavior(mode) || isQuirksModeBehavior(mode);
+        default:
+            return true;
+    }
 }
 
 } // namespace blink
 """
 
 
 class CSSValueKeywordsWriter(json5_generator.Writer):
     class_name = "CSSValueKeywords"
 
     def __init__(self, file_paths):
@@ skipping 60 matching lines @@
         # CalledProcessError like subprocess would do when shell=True is set.
         try:
             gperf = subprocess.Popen(gperf_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
             return gperf.communicate(gperf_input)[0]
         except OSError:
             raise subprocess.CalledProcessError(127, gperf_args, output='Command not found.')
 
 
 if __name__ == "__main__":
     json5_generator.Maker(CSSValueKeywordsWriter).main()