| 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 1ec040f2c6356d2be8b21b6ca11066431761a05a..dcf3b2563545a10248b7957f42d2d29b73c2f87c 100644
|
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -237,7 +237,7 @@ static NSSize abs(NSSize size) {
|
|
|
| ASSERT(scrollerImp == scrollbarPainterForScrollbar(*scrollbar));
|
|
|
| - return scrollbar->ConvertFromContainingFrameViewBase(
|
| + return scrollbar->ConvertFromContainingFrameView(
|
| blink::IntPoint(pointInContentArea));
|
| }
|
|
|
| @@ -495,7 +495,7 @@ class BlinkScrollbarPartAnimationTimer {
|
|
|
| DCHECK_EQ(scrollerImp, scrollbarPainterForScrollbar(*_scrollbar));
|
|
|
| - return _scrollbar->ConvertFromContainingFrameViewBase(
|
| + return _scrollbar->ConvertFromContainingFrameView(
|
| _scrollbar->GetScrollableArea()->LastKnownMousePosition());
|
| }
|
|
|
| @@ -1081,7 +1081,7 @@ void ScrollAnimatorMac::SetVisibleScrollerThumbRect(
|
| IntRect rect_in_view_coordinates = scroller_thumb;
|
| if (Scrollbar* vertical_scrollbar = scrollable_area_->VerticalScrollbar())
|
| rect_in_view_coordinates =
|
| - vertical_scrollbar->ConvertToContainingFrameViewBase(scroller_thumb);
|
| + vertical_scrollbar->ConvertToContainingFrameView(scroller_thumb);
|
|
|
| if (rect_in_view_coordinates == visible_scroller_thumb_rect_)
|
| return;
|
|
|