Revert of Enable -Wdeprecated-register.

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

 #!/usr/bin/env python
 
 import subprocess
 import sys
 
 import css_properties
 import json5_generator
 import license
 
 
@@ skipping 78 matching lines @@
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/WTFString.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 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 property_hash_function
 %%define slot-name nameOffset
 %%define word-array-name property_word_list
 %%enum
 %%%%
 %(property_to_enum_map)s
 %%%%
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-const Property* findProperty(const char* str, unsigned int len) {
-  return %(class_name)sHash::findPropertyImpl(str, len);
+const Property* findProperty(register const char* str, register unsigned int len)
+{
+    return %(class_name)sHash::findPropertyImpl(str, len);
 }
 
-const char* getPropertyName(CSSPropertyID id) {
-  DCHECK(isCSSPropertyIDWithName(id));
-  int index = id - firstCSSProperty;
-  return propertyNameStringsPool + propertyNameStringsOffsets[index];
+const char* getPropertyName(CSSPropertyID id)
+{
+    DCHECK(isCSSPropertyIDWithName(id));
+    int index = id - firstCSSProperty;
+    return propertyNameStringsPool + propertyNameStringsOffsets[index];
 }
 
-const AtomicString& getPropertyNameAtomicString(CSSPropertyID id) {
-  DCHECK(isCSSPropertyIDWithName(id));
-  int index = id - firstCSSProperty;
-  static AtomicString* propertyStrings =
-      new AtomicString[lastUnresolvedCSSProperty]; // Leaked.
-  AtomicString& propertyString = propertyStrings[index];
-  if (propertyString.isNull()) {
-    propertyString = AtomicString(propertyNameStringsPool +
-                     propertyNameStringsOffsets[index]);
-  }
-  return propertyString;
+const AtomicString& getPropertyNameAtomicString(CSSPropertyID id)
+{
+    DCHECK(isCSSPropertyIDWithName(id));
+    int index = id - firstCSSProperty;
+    static AtomicString* propertyStrings = new AtomicString[lastUnresolvedCSSProperty]; // Intentionally never destroyed.
+    AtomicString& propertyString = propertyStrings[index];
+    if (propertyString.isNull())
+        propertyString = AtomicString(propertyNameStringsPool + propertyNameStringsOffsets[index]);
+    return propertyString;
 }
 
-String getPropertyNameString(CSSPropertyID id) {
-  // We share the StringImpl with the AtomicStrings.
-  return getPropertyNameAtomicString(id).getString();
+String getPropertyNameString(CSSPropertyID id)
+{
+    // We share the StringImpl with the AtomicStrings.
+    return getPropertyNameAtomicString(id).getString();
 }
 
-String getJSPropertyName(CSSPropertyID id) {
-  char result[maxCSSPropertyNameLength + 1];
-  const char* cssPropertyName = getPropertyName(id);
-  const char* propertyNamePointer = cssPropertyName;
-  if (!propertyNamePointer)
-    return emptyString;
+String getJSPropertyName(CSSPropertyID id)
+{
+    char result[maxCSSPropertyNameLength + 1];
+    const char* cssPropertyName = getPropertyName(id);
+    const char* propertyNamePointer = cssPropertyName;
+    if (!propertyNamePointer)
+        return emptyString;
 
-  char* resultPointer = result;
-  while (char character = *propertyNamePointer++) {
-    if (character == '-') {
-      char nextCharacter = *propertyNamePointer++;
-      if (!nextCharacter)
-        break;
-      character = (propertyNamePointer - 2 != cssPropertyName)
-                      ? toASCIIUpper(nextCharacter) : nextCharacter;
+    char* resultPointer = result;
+    while (char character = *propertyNamePointer++) {
+        if (character == '-') {
+            char nextCharacter = *propertyNamePointer++;
+            if (!nextCharacter)
+                break;
+            character = (propertyNamePointer - 2 != cssPropertyName) ? toASCIIUpper(nextCharacter) : nextCharacter;
+        }
+        *resultPointer++ = character;
     }
-    *resultPointer++ = character;
-  }
-  *resultPointer = '\\0';
-  return String(result);
+    *resultPointer = '\\0';
+    return String(result);
 }
 
 CSSPropertyID cssPropertyID(const String& string)
 {
     return resolveCSSPropertyID(unresolvedCSSPropertyID(string));
 }
 
 } // namespace blink
 """
 
@@ skipping 54 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(CSSPropertyNamesWriter).main()