third_party/WebKit/Source/platform/scroll/Scrollbar.h - Issue 1486743002: Clean up some remaining obsolete coordinate-space naming.

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.h

Issue 1486743002: Clean up some remaining obsolete coordinate-space naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed Mac compile Created 5 years 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/ScrollableArea.h ('k') | third_party/WebKit/Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6764fb0190a22bcdb26e7c71df4419739bbc1737..34c9ed1bbc664ad1e3e70f00512b08170a85ff1f 100644

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

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

@@ -69,7 +69,7 @@ public:

void getTickmarks(Vector<IntRect>&) const override;

bool isScrollableAreaActive() const override;

- IntPoint convertFromContainingWindow(const IntPoint& windowPoint) const override { return Widget::convertFromContainingWindow(windowPoint); }

+ IntPoint convertFromRootFrame(const IntPoint& pointInRootFrame) const override { return Widget::convertFromRootFrame(pointInRootFrame); }

bool isCustomScrollbar() const override { return false; }

ScrollbarOrientation orientation() const override { return m_orientation; }

@@ -127,11 +127,11 @@ public:

ScrollbarTheme* theme() const { return m_theme; }

- IntRect convertToContainingView(const IntRect&) const override;

- IntRect convertFromContainingView(const IntRect&) const override;

+ IntRect convertToContainingWidget(const IntRect&) const override;

+ IntRect convertFromContainingWidget(const IntRect&) const override;

- IntPoint convertToContainingView(const IntPoint&) const override;

- IntPoint convertFromContainingView(const IntPoint&) const override;

+ IntPoint convertToContainingWidget(const IntPoint&) const override;

+ IntPoint convertFromContainingWidget(const IntPoint&) const override;

void moveThumb(int pos, bool draggingDocument = false);