rewrite_to_chrome_style: Force Get prefixes on a few more things
These appear to be problems on Android and OS X. There are
probably more...
BUG=578344
TBR=lukasza@chromium.org
Review-Url: https://codereview.chromium.org/2810533002 .
Cr-Commit-Position: refs/heads/master@{#463138}
diff --git a/tools/blink_rename_merge_helper/COMPONENTS b/tools/blink_rename_merge_helper/COMPONENTS
index 15ff20e..b573832 100644
--- a/tools/blink_rename_merge_helper/COMPONENTS
+++ b/tools/blink_rename_merge_helper/COMPONENTS
@@ -1,11 +1,11 @@
{
"pylib": "2af6a38142b87bc78f57f65030de579820406c4b",
"data": "2a75d6c41ca69e5278a46eb271296b9354d2728d",
- "bin-darwin": "7de9a312ba639d4a9080a03b8446b9b78e500cf0",
+ "bin-darwin": "f45f58ccbf42a26b0704f63d8740cf008b84afcc",
"include-darwin": "1a5693595308ffc3c2cd826ac21e538aeafe5345",
"lib-darwin": "29baf57b55dd0ab060baf0cd6461a7e0fa0105f4",
- "bin-linux*": "214bf7d8061c7820e7620a77deab78af4f159a23",
+ "bin-linux*": "c7c76f202a6d0feb77dd946b2e605a1ba56d3046",
"lib-linux*": "508b0ba0de0b4191a54360330f74cea8afd5ee93",
- "bin-win32": "a03d83443a103c388360a624500c9355a636de36",
+ "bin-win32": "f8ff17a5f080cef7639140b057a0f61b4d1a4f8f",
"lib-win32": "afb47503a4fd442c353ddaba6f17a81e6aa5a20f"
}
diff --git a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
index 5fced7a..d97c7ea 100644
--- a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
+++ b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
@@ -675,6 +675,7 @@
"color",
"compositorElementId",
"constructionStack",
+ "controlSize",
"counterDirectives",
"counterMaps",
"document",
@@ -730,9 +731,9 @@
"processingInstruction",
"qualifiedNameCache",
"readyState",
- "relList",
"referrer",
"referrerPolicy",
+ "relList",
"resource",
"response",
"restrictedKeyMap",
@@ -740,14 +741,18 @@
"screenInfo",
"screenOrientationController",
"scrollAnimator",
+ "scrollbarPainterMap",
+ "scrollbarSet",
"selectionInDOMTree",
"selectionInFlatTree",
"selectionVisualRectMap",
"selectorTextCache",
"settings",
+ "shadowRootType",
"signalingState",
"snapshotById",
"state",
+ "stickyConstraintsMap",
"string",
"styleSharingList",
"styleSheet",
@@ -755,6 +760,7 @@
"text",
"textAlign",
"textBaseline",
+ "textDirection",
"theme",
"thread",
"timing",
@@ -767,6 +773,8 @@
"webFrame",
"widget",
"wordBoundaries",
+ "workerThread",
+ "worldId",
"worldMap",
"wrapperTypeInfo"};
for (const auto& conflicting_method : kConflictingMethods) {
