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

« third_party/WebKit/LayoutTests/imported/web-platform-tests/FileAPI/idlharness.idl ('K') | « third_party/WebKit/Source/core/dom/PendingScript.cpp ('k') | third_party/WebKit/Source/core/editing/Editor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index aa90ea2c37cecb9d5c41aafbaeea881c3639f3e7..48068fe7559f0121fd7febd2df0e0c0a53b34ae5 100644

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

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

@@ -63,7 +63,7 @@ protected:

void setCaretVisibility(CaretVisibility visibility) { m_caretVisibility = visibility; }

bool caretIsVisible() const { return m_caretVisibility == Visible; }

- CaretVisibility caretVisibility() const { return m_caretVisibility; }

+ CaretVisibility getCaretVisibility() const { return m_caretVisibility; }

pdr. 2016/02/26 01:17:10 caretVisibile is another option for this one.

static LayoutBlock* caretLayoutObject(Node*);

static void invalidateLocalCaretRect(Node*, const LayoutRect&);