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..978e569105fd6f4ecb834fdc8b8e831784a6e873 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) { |
@@ -387,8 +385,11 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) { |
"layoutSize", |
Łukasz Anforowicz
2017/01/04 17:12:46
We need to add "hash" here, to force renaming into
nasko
2017/01/04 17:22:52
Done.
|
"length", |
"lineCap", |
+ "lineEndings", |
"lineJoin", |
+ "listItems", |
"matchedProperties", |
+ "mouseEvent", |
"name", |
"navigationType", |
"node", |
@@ -398,6 +399,7 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) { |
"path", |
"processingInstruction", |
"readyState", |
+ "relList", |
"response", |
"sandboxSupport", |
"screenInfo", |
@@ -405,14 +407,17 @@ bool ShouldPrefixFunctionName(const std::string& old_method_name) { |
"settings", |
"signalingState", |
"state", |
+ "styleSheet", |
"string", |
"text", |
"textAlign", |
"textBaseline", |
"theme", |
+ "thread", |
"timing", |
"topLevelBlameContext", |
"widget", |
+ "wordBoundaries", |
Łukasz Anforowicz
2017/01/04 17:12:46
Can you please also add method names from https://
nasko
2017/01/04 17:22:52
Done.
|
}; |
for (const auto& conflicting_method : kConflictingMethods) { |
if (old_method_name == conflicting_method) |