| Index: cc/scrollbar_animation_controller.cc
|
| diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
|
| index 7335e2c3a1855626743299657b4e44dc83c67202..5a603945908426b41b48a55ccf8eb6fc91cd7f04 100644
|
| --- a/cc/scrollbar_animation_controller.cc
|
| +++ b/cc/scrollbar_animation_controller.cc
|
| @@ -77,20 +77,20 @@ gfx::Size ScrollbarAnimationController::getScrollLayerBounds(const LayerImpl* sc
|
|
|
| void ScrollbarAnimationController::updateScrollOffsetAtTime(LayerImpl* scrollLayer, double)
|
| {
|
| - m_currentPos = scrollLayer->scrollPosition() + scrollLayer->scrollDelta();
|
| + m_currentOffset = scrollLayer->scrollOffset() + scrollLayer->scrollDelta();
|
| m_totalSize = getScrollLayerBounds(scrollLayer);
|
| - m_maximum = scrollLayer->maxScrollPosition();
|
| + m_maximum = scrollLayer->maxScrollOffset();
|
|
|
| if (m_horizontalScrollbarLayer) {
|
| - m_horizontalScrollbarLayer->setCurrentPos(m_currentPos.x());
|
| + m_horizontalScrollbarLayer->setCurrentPos(m_currentOffset.x());
|
| m_horizontalScrollbarLayer->setTotalSize(m_totalSize.width());
|
| - m_horizontalScrollbarLayer->setMaximum(m_maximum.width());
|
| + m_horizontalScrollbarLayer->setMaximum(m_maximum.x());
|
| }
|
|
|
| if (m_verticalScrollbarLayer) {
|
| - m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y());
|
| + m_verticalScrollbarLayer->setCurrentPos(m_currentOffset.y());
|
| m_verticalScrollbarLayer->setTotalSize(m_totalSize.height());
|
| - m_verticalScrollbarLayer->setMaximum(m_maximum.height());
|
| + m_verticalScrollbarLayer->setMaximum(m_maximum.y());
|
| }
|
| }
|
|
|
|
|