Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: third_party/WebKit/Source/core/page/TouchAdjustment.cpp

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6
Patch Set: get-names-7: rebase Created 4 years, 10 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
Download patch
Index: third_party/WebKit/Source/core/page/TouchAdjustment.cpp
diff --git a/third_party/WebKit/Source/core/page/TouchAdjustment.cpp b/third_party/WebKit/Source/core/page/TouchAdjustment.cpp
index 0b5ab3025c1b39c2eec0e2011df59b752171f18c..7c87156fbd76f1cf595d66ac7a4e22632649345c 100644
--- a/third_party/WebKit/Source/core/page/TouchAdjustment.cpp
+++ b/third_party/WebKit/Source/core/page/TouchAdjustment.cpp
@@ -130,7 +130,7 @@ bool providesContextMenuItems(Node* node)
return true;
// Only the selected part of the layoutObject is a valid target, but this will be corrected in
// appendContextSubtargetsForNode.
- if (node->layoutObject()->selectionState() != SelectionNone)
+ if (node->layoutObject()->getSelectionState() != SelectionNone)
return true;
}
return false;
@@ -184,11 +184,11 @@ static inline void appendContextSubtargetsForNode(Node* node, SubtargetGeometryL
lastOffset = offset;
}
} else {
- if (textLayoutObject->selectionState() == SelectionNone)
+ if (textLayoutObject->getSelectionState() == SelectionNone)
return appendBasicSubtargetsForNode(node, subtargets);
// If selected, make subtargets out of only the selected part of the text.
int startPos, endPos;
- switch (textLayoutObject->selectionState()) {
+ switch (textLayoutObject->getSelectionState()) {
case SelectionInside:
startPos = 0;
endPos = textLayoutObject->textLength();

Powered by Google App Engine
This is Rietveld 408576698