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 2da3ac9399d8ff0f97a0b502be7d93316862d20b..8dada3bb7d70b75faa64d22525e27d96eb53b9a0 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; |