tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp - Issue 2799803003: Requiring Get prefix for 13 more methods (to avoid conflicts after Blink rename)

Unified Diff: tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

Issue 2799803003: Requiring Get prefix for 13 more methods (to avoid conflicts after Blink rename) (Closed)

Patch Set: git cl format Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

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 832ee5ac90c6de294c00e1eec556b3311e6b936b..5ee01b93e5a1866de42c7dc2ed86cf4cd77fb94c 100644

--- a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

+++ b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

@@ -657,98 +657,108 @@ AST_MATCHER_P(clang::QualType, hasString, std::string, ExpectedString) {

bool ShouldPrefixFunctionName(const std::string& old_method_name) {

// Functions that are named similarily to a type - they should be prefixed

// with a "Get" prefix.

- static const char* kConflictingMethods[] = {

- "accumulatorMap",

- "animationWorklet",

- "audioWorklet",

- "binaryType",

- "blob",

- "channelCountMode",

- "color",

- "compositorElementId",

- "counterDirectives",

- "document",

- "element",

- "emptyChromeClient",

- "emptyEditorClient",

- "emptySpellCheckerClient",

- "entryType",

- "error",

- "eventTargetDataMap",

- "fileUtilities",

- "font",

- "frame",

- "frameBlameContext",

- "frontend",

- "gridCell",

- "hash",

- "heapObjectHeader",

- "heapObjectSet",

- "iconURL",

- "image",

- "inputMethodController",

- "inputType",

- "interpolationTypes",

- "layout",

- "layoutBlock",

- "layoutObject",

- "layoutSize",

- "lineCap",

- "lineEndings",

- "lineJoin",

- "listItems",

- "matchedProperties",

- "midpointState",

- "modifiers",

- "mouseEvent",

- "name",

- "navigationType",

- "node",

- "notificationManager",

- "outcome",

- "pagePopup",

- "paintWorklet",

- "path",

- "position",

- "processingInstruction",

- "qualifiedNameCache",

- "readyState",

- "relList",

- "referrer",

- "referrerPolicy",

- "resource",

- "response",

- "restrictedKeyMap",

- "sandboxSupport",

- "screenInfo",

- "screenOrientationController",

- "scrollAnimator",

- "selectionInDOMTree",

- "selectionInFlatTree",

- "selectorTextCache",

- "settings",

- "signalingState",

- "snapshotById",

- "state",

- "string",

- "styleSheet",

- "supplementable",

- "text",

- "textAlign",

- "textBaseline",

- "theme",

- "thread",

- "timing",

- "topLevelBlameContext",

- "type",

- "vector",

- "visibleSelection",

- "visibleSelectionInFlatTree",

- "webFrame",

- "widget",

- "wordBoundaries",

- "wrapperTypeInfo",

- };

+ static const char* kConflictingMethods[] = {"accumulatorMap",

+ "animationWorklet",

+ "attrNodeList",

+ "audioWorklet",

+ "binaryType",

+ "blob",

+ "channelCountMode",

+ "color",

+ "compositorElementId",

+ "constructionStack",

+ "counterDirectives",

+ "counterMaps"

+ "document",

+ "element",

+ "emptyChromeClient",

+ "emptyEditorClient",

+ "emptySpellCheckerClient",

+ "entryType",

+ "error",

+ "eventTargetDataMap",

+ "fileUtilities",

+ "font",

+ "frame",

+ "frameBlameContext",

+ "frontend",

+ "gridCell",

+ "harfBuzzFontCache",

+ "hash",

+ "heapObjectHeader",

+ "heapObjectSet",

+ "iconURL",

+ "image",

+ "infoMap",

+ "inputMethodController",

+ "inputType",

+ "interpolationTypes",

+ "intervalArena",

+ "layout",

+ "layoutBlock",

+ "layoutObject",

+ "layoutSize",

+ "lineCap",

+ "lineEndings",

+ "lineJoin",

+ "listItems",

+ "matchedProperties",

+ "midpointState",

+ "modifiers",

+ "mouseEvent",

+ "name",

+ "navigationType",

+ "node",

+ "notificationManager",

+ "originAccessMap",

+ "outcome",

+ "pagePopup",

+ "paintWorklet",

+ "path",

+ "position",

+ "presentationAttributeCache",

+ "processingInstruction",

+ "qualifiedNameCache",

+ "readyState",

+ "relList",

+ "referrer",

+ "referrerPolicy",

+ "resource",

+ "response",

+ "restrictedKeyMap",

+ "sandboxSupport",

+ "screenInfo",

+ "screenOrientationController",

+ "scrollAnimator",

+ "selectionInDOMTree",

+ "selectionInFlatTree",

+ "selectionVisualRectMap",

+ "selectorTextCache",

+ "settings",

+ "signalingState",

+ "snapshotById",

+ "state",

+ "string",

+ "styleSharingList",

+ "styleSheet",

+ "supplementable",

+ "text",

+ "textAlign",

+ "textBaseline",

+ "theme",

+ "thread",

+ "timing",

+ "topLevelBlameContext",

+ "type",

+ "vector",

+ "visibleSelection",

+ "visibleSelectionInFlatTree",

+ "weakHeapObjectSet",

+ "webFrame",

+ "widget",

+ "wordBoundaries",

+ "worldMap",

+ "wrapperTypeInfo"};

for (const auto& conflicting_method : kConflictingMethods) {

if (old_method_name == conflicting_method)

return true;

« no previous file with comments | « no previous file | no next file » | no next file with comments »