third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm - 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/mac/ScrollAnimatorMac.mm

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/exported/WebScrollbarThemeClientImpl.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollableArea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

index 02e5cd16ca8d0bc0450683472f6791cd634a0701..af0ba67338b5f5987d2c1c4ce6ef01c3f0c3af5a 100644

--- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

+++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

@@ -253,7 +253,7 @@ static NSSize abs(NSSize size)

ASSERT(scrollerImp == scrollbarPainterForScrollbar(scrollbar));

- return scrollbar->convertFromContainingView(blink::IntPoint(pointInContentArea));

+ return scrollbar->convertFromContainingWidget(blink::IntPoint(pointInContentArea));

}

- (void)scrollerImpPair:(id)scrollerImpPair setContentAreaNeedsDisplayInRect:(NSRect)rect

@@ -521,7 +521,7 @@ private:

ASSERT_UNUSED(scrollerImp, scrollerImp == scrollbarPainterForScrollbar(_scrollbar));

- return _scrollbar->convertFromContainingView(_scrollbar->scrollableArea()->lastKnownMousePosition());

+ return _scrollbar->convertFromContainingWidget(_scrollbar->scrollableArea()->lastKnownMousePosition());

}

- (void)setUpAlphaAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(blink::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration

@@ -1182,7 +1182,7 @@ void ScrollAnimatorMac::setVisibleScrollerThumbRect(const IntRect& scrollerThumb

{

IntRect rectInViewCoordinates = scrollerThumb;

if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar())

- rectInViewCoordinates = verticalScrollbar->convertToContainingView(scrollerThumb);

+ rectInViewCoordinates = verticalScrollbar->convertToContainingWidget(scrollerThumb);

if (rectInViewCoordinates == m_visibleScrollerThumbRect)

return;