Index: third_party/WebKit/Source/web/WebViewImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp |
index 966246fcdad04935da3cc88f8772888c5ab80244..cd19c896725f746ec54213e16114989f3cda679f 100644 |
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp |
@@ -882,7 +882,7 @@ WebInputEventResult WebViewImpl::handleGestureEvent( |
// TODO(bokan): We shouldn't pass details of the VisualViewport offset |
// to render_view_impl. crbug.com/459591 |
WebSize visualViewportOffset = |
- flooredIntSize(visualViewport.location()); |
+ flooredIntSize(visualViewport.scrollOffset()); |
if (m_webSettings->multiTargetTapNotificationEnabled()) { |
Vector<IntRect> goodTargets; |
@@ -1029,9 +1029,10 @@ bool WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition, |
setPageScaleFactor(newScale); |
FrameView* view = mainFrameImpl()->frameView(); |
- if (view && view->getScrollableArea()) |
- view->getScrollableArea()->setScrollPosition( |
- DoublePoint(clampedPoint.x, clampedPoint.y), ProgrammaticScroll); |
+ if (view && view->getScrollableArea()) { |
+ view->getScrollableArea()->setScrollOffset( |
+ ScrollOffset(clampedPoint.x, clampedPoint.y), ProgrammaticScroll); |
+ } |
return false; |
} |
@@ -3391,7 +3392,7 @@ void WebViewImpl::scrollAndRescaleViewports( |
// Order is important: visual viewport location is clamped based on |
// main frame scroll position and visual viewport scale. |
- view->setScrollPosition(mainFrameOrigin, ProgrammaticScroll); |
+ view->setScrollOffset(toScrollOffset(mainFrameOrigin), ProgrammaticScroll); |
setPageScaleFactor(scaleFactor); |
@@ -3703,9 +3704,8 @@ void WebViewImpl::resetScrollAndScaleState() { |
if (FrameView* frameView = toLocalFrame(page()->mainFrame())->view()) { |
ScrollableArea* scrollableArea = frameView->layoutViewportScrollableArea(); |
- if (scrollableArea->scrollPositionDouble() != DoublePoint::zero()) |
- scrollableArea->setScrollPosition(DoublePoint::zero(), |
- ProgrammaticScroll); |
+ if (!scrollableArea->scrollOffset().isZero()) |
+ scrollableArea->setScrollOffset(ScrollOffset(), ProgrammaticScroll); |
} |
pageScaleConstraintsSet().setNeedsReset(true); |