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

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

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

index f9e3ba0e3c77930a62846a3d3fc637387c6cbd26..a20cec89a5ec749251a0bf74e99b38e43c779f0f 100644

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

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

@@ -709,7 +709,7 @@ void FrameSelection::invalidateCaretRect()

if (!m_caretBlinkTimer.isActive()

&& newNode == m_previousCaretNode

&& newRect == m_previousCaretRect

- && caretVisibility() == m_previousCaretVisibility)

+ && getCaretVisibility() == m_previousCaretVisibility)

return;

LayoutView* view = m_frame->document()->layoutView();

@@ -719,7 +719,7 @@ void FrameSelection::invalidateCaretRect()

invalidateLocalCaretRect(newNode, newRect);

m_previousCaretNode = newNode;

m_previousCaretRect = newRect;

- m_previousCaretVisibility = caretVisibility();

+ m_previousCaretVisibility = getCaretVisibility();

}

void FrameSelection::paintCaret(GraphicsContext& context, const LayoutPoint& paintOffset)

@@ -1016,7 +1016,7 @@ void FrameSelection::updateAppearance()

void FrameSelection::setCaretVisibility(CaretVisibility visibility)

{

- if (caretVisibility() == visibility)

+ if (getCaretVisibility() == visibility)

return;

CaretBase::setCaretVisibility(visibility);

@@ -1211,7 +1211,7 @@ void FrameSelection::revealSelection(const ScrollAlignment& alignment, RevealExt

{

LayoutRect rect;

- switch (selectionType()) {

+ switch (getSelectionType()) {

case NoSelection:

return;

case CaretSelection: