Update methods requiring Get prefix to avoid collisions with Blink rewrite.

This CL adds a few more methods that cause name collisions when Blink
is rewritten to match Chromium style. In addition, it removes the hash
method from the blacklist.

BUG=582312, 677166

Review-Url: https://codereview.chromium.org/2608423003
Cr-Commit-Position: refs/heads/master@{#441429}

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

@@ -214,9 +214,7 @@ bool IsBlacklistedFunctionName(llvm::StringRef name) {
   if (name.find('_') != llvm::StringRef::npos)
     return true;
 
-  // https://crbug.com/677166: Have to avoid renaming |hash| -> |Hash| to avoid
-  // colliding with a struct already named |Hash|.
-  return name == "hash";
+  return false;
 }
 
 bool IsBlacklistedFreeFunctionName(llvm::StringRef name) {
@@ -358,8 +356,8 @@ AST_MATCHER_P(clang::QualType, hasString, std::string, ExpectedString) {
 }
 
 bool ShouldPrefixFunctionName(const std::string& old_method_name) {
-  // Methods that are named similarily to a type - they should be prefixed
-  // with a "get" prefix.
+  // Functions that are named similarily to a type - they should be prefixed
+  // with a "Get" prefix.
   static const char* kConflictingMethods[] = {
       "animationWorklet",
       "audioWorklet",
@@ -378,6 +376,9 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) {
       "font",
       "frame",
       "frameBlameContext",
+      "frontend",
+      "hash",
+      "heapObjectHeader",
       "iconURL",
       "inputMethodController",
       "inputType",
@@ -387,8 +388,12 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) {
       "layoutSize",
       "length",
       "lineCap",
+      "lineEndings",
       "lineJoin",
+      "listItems",
       "matchedProperties",
+      "midpointState",
+      "mouseEvent",
       "name",
       "navigationType",
       "node",
@@ -398,6 +403,8 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) {
       "path",
       "processingInstruction",
       "readyState",
+      "relList",
+      "resource",
       "response",
       "sandboxSupport",
       "screenInfo",
@@ -406,13 +413,18 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) {
       "signalingState",
       "state",
       "string",
+      "styleSheet",
       "text",
       "textAlign",
       "textBaseline",
       "theme",
+      "thread",
       "timing",
       "topLevelBlameContext",
+      "vector",
       "widget",
+      "wordBoundaries",
+      "wrapperTypeInfo",
   };
   for (const auto& conflicting_method : kConflictingMethods) {
     if (old_method_name == conflicting_method)

tools/clang/rewrite_to_chrome_style/tests/methods-expected.cc

@@ -253,12 +253,6 @@ class Foo {
   void begin() {}
   static void Begin(int x) {}
 
-  // https://crbug.com/677166: We blacklist renaming of |hash|, because it
-  // collides with a struct named Hash.  Blacklisting therefore should be broad
-  // and should cover both instance and static methods as well as functions.
-  int hash() const { return 123; }
-  static int hash(const Foo& x) { return x.hash(); }
-
   // https://crbug.com672902: std-like names should not be rewritten.
   void emplace_back(int x) {}
   void insert(int x) {}
@@ -270,9 +264,6 @@ class Foo {
 };
 
 void Begin(int x) {}
-int hash(int x) {
-  return 123 * x;
-}
 void swap(Foo& x, Foo& y) {}
 
 }  // blacklisting_of_method_and_function_names

tools/clang/rewrite_to_chrome_style/tests/methods-original.cc

@@ -257,12 +257,6 @@ class Foo {
   void begin() {}
   static void begin(int x) {}
 
-  // https://crbug.com/677166: We blacklist renaming of |hash|, because it
-  // collides with a struct named Hash.  Blacklisting therefore should be broad
-  // and should cover both instance and static methods as well as functions.
-  int hash() const { return 123; }
-  static int hash(const Foo& x) { return x.hash(); }
-
   // https://crbug.com672902: std-like names should not be rewritten.
   void emplace_back(int x) {}
   void insert(int x) {}
@@ -274,9 +268,6 @@ class Foo {
 };
 
 void begin(int x) {}
-int hash(int x) {
-  return 123 * x;
-}
 void swap(Foo& x, Foo& y) {}
 
 }  // blacklisting_of_method_and_function_names