third_party/WebKit/Source/core/editing/VisibleSelection.h - Issue 1738623004: Rename enums/functions that collide in chromium style.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/editing/VisibleSelection.h

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4

Patch Set: get-names-5: rebase-and-stuff 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/SelectionController.cpp ('k') | third_party/WebKit/Source/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/VisibleSelection.h

diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.h b/third_party/WebKit/Source/core/editing/VisibleSelection.h

index 1916386ce1e2b1af77f0874972a7c5091025757e..25608c3818df9d6371433a500d7ad130e93cda2a 100644

--- a/third_party/WebKit/Source/core/editing/VisibleSelection.h

+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.h

@@ -79,7 +79,7 @@ public:

static VisibleSelectionTemplate selectionFromContentsOfNode(Node*);

- SelectionType selectionType() const { return m_selectionType; }

+ SelectionType getSelectionType() const { return m_selectionType; }

void setAffinity(TextAffinity affinity) { m_affinity = affinity; }

TextAffinity affinity() const { return m_affinity; }

@@ -102,10 +102,10 @@ public:

bool operator==(const VisibleSelectionTemplate&) const;

bool operator!=(const VisibleSelectionTemplate& other) const { return !operator==(other); }

- bool isNone() const { return selectionType() == NoSelection; }

- bool isCaret() const { return selectionType() == CaretSelection; }

- bool isRange() const { return selectionType() == RangeSelection; }

- bool isCaretOrRange() const { return selectionType() != NoSelection; }

+ bool isNone() const { return getSelectionType() == NoSelection; }

+ bool isCaret() const { return getSelectionType() == CaretSelection; }

+ bool isRange() const { return getSelectionType() == RangeSelection; }

+ bool isCaretOrRange() const { return getSelectionType() != NoSelection; }

bool isNonOrphanedRange() const { return isRange() && !start().isOrphan() && !end().isOrphan(); }

bool isNonOrphanedCaretOrRange() const { return isCaretOrRange() && !start().isOrphan() && !end().isOrphan(); }