third_party/WebKit/Source/core/layout/api/LineLayoutItem.h - Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/.

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/layout/api/LineLayoutItem.h

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

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutView.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/api/LineLayoutItem.h

diff --git a/third_party/WebKit/Source/core/layout/api/LineLayoutItem.h b/third_party/WebKit/Source/core/layout/api/LineLayoutItem.h

index 8824f1de4756730f244e129af8dc8d505272bc2f..da672d75a7b1b8f2d150c2c4ef5c86e7ef97386b 100644

--- a/third_party/WebKit/Source/core/layout/api/LineLayoutItem.h

+++ b/third_party/WebKit/Source/core/layout/api/LineLayoutItem.h

@@ -335,9 +335,9 @@ public:

return m_layoutObject->hitTest(result, locationInContainer, accumulatedOffset, filter);

}

- SelectionState selectionState() const

+ SelectionState getSelectionState() const

{

- return m_layoutObject->selectionState();

+ return m_layoutObject->getSelectionState();

}

Color selectionBackgroundColor() const