third_party/WebKit/Source/core/editing/SelectionController.cpp - 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/SelectionController.cpp

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/PendingSelection.cpp ('k') | third_party/WebKit/Source/core/editing/VisibleSelection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/SelectionController.cpp

diff --git a/third_party/WebKit/Source/core/editing/SelectionController.cpp b/third_party/WebKit/Source/core/editing/SelectionController.cpp

index 5369bad9283dadb9684d8255b36e6e723630aaa8..ad5f87eb872da8392fb365ba910e6e2da2bf1674 100644

--- a/third_party/WebKit/Source/core/editing/SelectionController.cpp

+++ b/third_party/WebKit/Source/core/editing/SelectionController.cpp

@@ -610,9 +610,9 @@ bool SelectionController::mouseDownWasSingleClickInSelection() const

void SelectionController::notifySelectionChanged()

{

- if (selection().selectionType() == SelectionType::RangeSelection)

+ if (selection().getSelectionType() == SelectionType::RangeSelection)

m_selectionState = SelectionState::ExtendedSelection;

- else if (selection().selectionType() == SelectionType::CaretSelection)

+ else if (selection().getSelectionType() == SelectionType::CaretSelection)

m_selectionState = SelectionState::PlacedCaret;

else

m_selectionState = SelectionState::HaveNotStartedSelection;