Index: tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp |
diff --git a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp |
index 83c6eb22e6270c918918efe1d359a41be0b4d2ba..40a00bb31bd8f7564118ed9f2f84e09e155de8c5 100644 |
--- a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp |
+++ b/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) { |
@@ -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) |