third_party/WebKit/Source/platform/scroll/Scrollbar.cpp - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

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/platform/scroll/Scrollbar.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-13-platform: . 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/platform/scroll/Scrollbar.h ('k') | third_party/WebKit/Source/platform/scroll/ScrollbarThemeClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

index e48362a77bcc9b7c7ba798ff3c39d76bd24eb5c7..f9c0eb285132682ff2107081b594d21cb7050f6d 100644

--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

@@ -109,9 +109,9 @@ void Scrollbar::setFrameRect(const IntRect& frameRect)

setNeedsPaintInvalidation(AllParts);

}

-ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const

+ScrollbarOverlayStyle Scrollbar::getScrollbarOverlayStyle() const

{

- return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;

+ return m_scrollableArea ? m_scrollableArea->getScrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;

}

void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const