| 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 8f9fd16502a679e68efd27872abd9dcfbd0d4ae7..04a52cdc1cfd6dd2ceccd76f79ad5d0f15af2cf5 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
|
| @@ -252,8 +252,7 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument) {
|
| if (m_draggingDocument)
|
| delta = pos - m_documentDragPos;
|
| m_draggingDocument = true;
|
| - ScrollOffset currentPosition =
|
| - m_scrollableArea->scrollAnimator().currentOffset();
|
| + ScrollOffset currentPosition = m_scrollableArea->scrollOffset();
|
| float destinationPosition =
|
| (m_orientation == HorizontalScrollbar ? currentPosition.width()
|
| : currentPosition.height()) +
|
| @@ -599,11 +598,11 @@ float Scrollbar::scrollableAreaTargetPos() const {
|
| return 0;
|
|
|
| if (m_orientation == HorizontalScrollbar) {
|
| - return m_scrollableArea->scrollAnimator().desiredTargetOffset().width() -
|
| + return m_scrollableArea->scrollAnimatorDesiredTargetOffset().width() -
|
| m_scrollableArea->minimumScrollOffset().width();
|
| }
|
|
|
| - return m_scrollableArea->scrollAnimator().desiredTargetOffset().height() -
|
| + return m_scrollableArea->scrollAnimatorDesiredTargetOffset().height() -
|
| m_scrollableArea->minimumScrollOffset().height();
|
| }
|
|
|
|
|