Remove WebViewImpl helper methods for setting scroll offset.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3123 matching lines @@
 {
     ASSERT(page());
 
     scaleFactor = clampPageScaleFactorToLimits(scaleFactor);
     if (scaleFactor == pageScaleFactor())
         return;
 
     page()->frameHost().pinchViewport().setScale(scaleFactor);
 }
 
-void WebViewImpl::setMainFrameScrollOffset(const WebPoint& origin)
-{
-    updateLayoutViewportScrollPosition(DoublePoint(origin.x, origin.y), false);
-}
-
 float WebViewImpl::deviceScaleFactor() const
 {
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 void WebViewImpl::setDeviceScaleFactor(float scaleFactor)
 {
@@ skipping 237 matching lines @@
     return pageScaleConstraintsSet().finalConstraints().minimumScale;
 }
 
 float WebViewImpl::maximumPageScaleFactor() const
 {
     return pageScaleConstraintsSet().finalConstraints().maximumScale;
 }
 
 void WebViewImpl::resetScrollAndScaleState()
 {
-    updateLayoutViewportScrollPosition(IntPoint(), true);
     page()->frameHost().pinchViewport().reset();
 
     if (!page()->mainFrame()->isLocalFrame())
         return;
 
+    if (FrameView* frameView = toLocalFrame(page()->mainFrame())->view()) {
+        ScrollableArea* scrollableArea = frameView->layoutViewportScrollableArea();
+
+        if (scrollableArea->scrollPositionDouble() != DoublePoint::zero())
+            scrollableArea->notifyScrollPositionChanged(DoublePoint::zero());
+    }
+
     // Clear out the values for the current history item. This will prevent the history item from clobbering the
     // value determined during page scale initialization, which may be less than 1.
     page()->deprecatedLocalMainFrame()->loader().clearScrollPositionAndViewState();
     pageScaleConstraintsSet().setNeedsReset(true);
 
     // Clobber saved scales and scroll offsets.
     if (FrameView* view = page()->deprecatedLocalMainFrame()->document()->view())
         view->cacheCurrentScrollPosition();
 }
 
@@ skipping 819 matching lines @@
     if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
         devTools->layerTreeViewChanged(m_layerTreeView);
 
     m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0);
 
     // FIXME: only unittests, click to play, Android priting, and printing (for headers and footers)
     // make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.
     ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeView());
 }
 
-void WebViewImpl::updateLayoutViewportScrollPosition(const DoublePoint& scrollPosition, bool programmaticScroll)
-{
-    if (!page()->mainFrame()->isLocalFrame())
-        return;
-
-    // FIXME(305811): Refactor for OOPI.
-    FrameView* frameView = page()->deprecatedLocalMainFrame()->view();
-    if (!frameView)
-        return;
-
-    ScrollableArea* scrollableArea = frameView->layoutViewportScrollableArea();
-    if (scrollableArea->scrollPositionDouble() == scrollPosition)
-        return;
-
-    scrollableArea->notifyScrollPositionChanged(scrollPosition);
-    if (!programmaticScroll)
-        frameView->setWasScrolledByUser(true);
-}
-
 void WebViewImpl::applyViewportDeltas(
     const WebFloatSize& pinchViewportDelta,
     const WebFloatSize& outerViewportDelta,
     const WebFloatSize& elasticOverscrollDelta,
     float pageScaleDelta,
     float topControlsShownRatioDelta)
 {
     if (!mainFrameImpl())
         return;
     FrameView* frameView = mainFrameImpl()->frameView();
     if (!frameView)
         return;
 
     topControls().setShownRatio(topControls().shownRatio() + topControlsShownRatioDelta);
 
     FloatPoint pinchViewportOffset = page()->frameHost().pinchViewport().visibleRect().location();
     pinchViewportOffset.move(pinchViewportDelta.width, pinchViewportDelta.height);
     setPageScaleFactorAndLocation(pageScaleFactor() * pageScaleDelta, pinchViewportOffset);
 
     if (pageScaleDelta != 1)
         m_doubleTapZoomPending = false;
 
     frameView->setElasticOverscroll(elasticOverscrollDelta + frameView->elasticOverscroll());
 
-    updateLayoutViewportScrollPosition(frameView->layoutViewportScrollableArea()->scrollPositionDouble() +
-        DoubleSize(outerViewportDelta.width, outerViewportDelta.height), /* programmaticScroll */ false);
+    ScrollableArea* layoutViewport = frameView->layoutViewportScrollableArea();

[skobes, 2015/06/03 16:57:57]

It's confusing to use both "layout viewport" and "outer viewport" when they're
the same thing.  Can we either name this outerViewport, or change
outerViewportDelta to layoutViewportDelta?

[bokan, 2015/06/03 17:04:58]

Done.

+
+    DoublePoint layoutViewportPosition = layoutViewport->scrollPositionDouble()
+        + DoubleSize(outerViewportDelta.width, outerViewportDelta.height);
+
+    if (layoutViewport->scrollPositionDouble() != layoutViewportPosition) {
+        layoutViewport->notifyScrollPositionChanged(layoutViewportPosition);
+        frameView->setWasScrolledByUser(true);
+    }
 }
 
 void WebViewImpl::recordFrameTimingEvent(FrameTimingEventType eventType, int64_t FrameId, const WebVector<WebFrameTimingEvent>& events)
 {
     Frame* frame = m_page ? m_page->mainFrame() : 0;
 
     while (frame && frame->frameID() != FrameId) {
         frame = frame->tree().traverseNext();
     }
 
@@ skipping 162 matching lines @@
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 void WebViewImpl::forceNextDrawingBufferCreationToFail()
 {
     DrawingBuffer::forceNextDrawingBufferCreationToFail();
 }
 
 } // namespace blink