Fix main thread top controls scrolling to mirror CC.

third_party/WebKit/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 1810 matching lines @@
     updateMainFrameLayoutSize();
 
     page()->frameHost().visualViewport().setSize(m_size);
 
     if (mainFrameImpl()->frameView()) {
         if (!mainFrameImpl()->frameView()->needsLayout())
             postLayoutResize(mainFrameImpl());
     }
 }
 
-void WebViewImpl::setTopControlsHeight(float height, bool topControlsShrinkLayoutSize)
-{
-    topControls().setHeight(height, topControlsShrinkLayoutSize);
-}
-
 void WebViewImpl::updateTopControlsState(WebTopControlsState constraint, WebTopControlsState current, bool animate)
 {
     topControls().updateConstraints(constraint);
     if (m_layerTreeView)
         m_layerTreeView->updateTopControlsState(constraint, current, animate);
 }
 
 void WebViewImpl::didUpdateTopControls()
 {
     if (m_layerTreeView) {
         m_layerTreeView->setTopControlsShownRatio(topControls().shownRatio());
         m_layerTreeView->setTopControlsHeight(topControls().height(), topControls().shrinkViewport());
     }
 
     WebLocalFrameImpl* mainFrame = mainFrameImpl();
     if (!mainFrame)
         return;
 
     FrameView* view = mainFrame->frameView();
     if (!view)
         return;
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
-    float topControlsViewportAdjustment = topControls().layoutHeight() - topControls().contentOffset();
-    visualViewport.setTopControlsAdjustment(topControlsViewportAdjustment);
 
-    // Shrink the FrameView by the amount that will maintain the aspect-ratio with the VisualViewport.
-    view->setTopControlsViewportAdjustment(topControlsViewportAdjustment / minimumPageScaleFactor());
+    {
+        // This object will save the current visual viewport offset w.r.t. the
+        // document and restore it when the object goes out of scope. It's
+        // needed since the top controls adjustment will change the maximum
+        // scroll offset and we may need to reposition them to keep the user's
+        // apparent position unchanged.
+        ResizeViewportAnchor anchor(*view, visualViewport);
+
+        float topControlsViewportAdjustment =
+            topControls().layoutHeight() - topControls().contentOffset();
+        visualViewport.setTopControlsAdjustment(topControlsViewportAdjustment);
+
+        // Since the FrameView is sized to be the visual viewport at minimum
+        // scale, its adjustment must also be scaled by the minimum scale.
+        view->setTopControlsViewportAdjustment(
+            topControlsViewportAdjustment / minimumPageScaleFactor());
+    }
 }
 
 TopControls& WebViewImpl::topControls()
 {
     return page()->frameHost().topControls();
 }
 
-void WebViewImpl::resizeViewWhileAnchored(FrameView* view)
+void WebViewImpl::resizeViewWhileAnchored(
+    FrameView* view, float topControlsHeight, bool topControlsShrinkLayout)
 {
     DCHECK(mainFrameImpl());
     DCHECK(mainFrameImpl()->frame()->isLocalFrame());
 
+    topControls().setHeight(topControlsHeight, topControlsShrinkLayout);
+
     {
         // Avoids unnecessary invalidations while various bits of state in TextAutosizer are updated.
         TextAutosizer::DeferUpdatePageInfo deferUpdatePageInfo(page());
         performResize();
     }
 
     m_fullscreenController->updateSize();
 
     // Update lifecyle phases immediately to recalculate the minimum scale limit for rotation anchoring,
     // and to make sure that no lifecycle states are stale if this WebView is embedded in another one.
     updateAllLifecyclePhases();
 }
 
-void WebViewImpl::resize(const WebSize& newSize)
+void WebViewImpl::resizeWithTopControls(const WebSize& newSize, float topControlsHeight, bool topControlsShrinkLayout)
 {
-    if (m_shouldAutoResize || m_size == newSize)
+    if (m_shouldAutoResize)
+        return;
+
+    if (m_size == newSize
+        && topControls().height() == topControlsHeight
+        && topControls().shrinkViewport() == topControlsShrinkLayout)
         return;
 
     if (page()->mainFrame() && !page()->mainFrame()->isLocalFrame()) {
         // Viewport resize for a remote main frame does not require any
         // particular action, but the state needs to reflect the correct size
         // so that it can be used for initalization if the main frame gets
         // swapped to a LocalFrame at a later time.
         m_size = newSize;
         pageScaleConstraintsSet().didChangeInitialContainingBlockSize(m_size);
         page()->frameHost().visualViewport().setSize(m_size);
@@ skipping 10 matching lines @@
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
 
     bool isRotation = settings()->mainFrameResizesAreOrientationChanges()
         && m_size.width && contentsSize().width() && newSize.width != m_size.width && !m_fullscreenController->isFullscreen();
     m_size = newSize;
 
     FloatSize viewportAnchorCoords(viewportAnchorCoordX, viewportAnchorCoordY);
     if (isRotation) {
         RotationViewportAnchor anchor(*view, visualViewport, viewportAnchorCoords, pageScaleConstraintsSet());
-        resizeViewWhileAnchored(view);
+        resizeViewWhileAnchored(view, topControlsHeight, topControlsShrinkLayout);
     } else {
         ResizeViewportAnchor anchor(*view, visualViewport);
-        resizeViewWhileAnchored(view);
+        resizeViewWhileAnchored(view, topControlsHeight, topControlsShrinkLayout);
     }
     sendResizeEventAndRepaint();
 }
 
+void WebViewImpl::resize(const WebSize& newSize)
+{
+    if (m_shouldAutoResize || m_size == newSize)
+        return;
+
+    resizeWithTopControls(
+        newSize, topControls().height(), topControls().shrinkViewport());
+}
+
 void WebViewImpl::didEnterFullScreen()
 {
     m_fullscreenController->didEnterFullScreen();
 }
 
 void WebViewImpl::didExitFullScreen()
 {
     m_fullscreenController->didExitFullScreen();
 }
 
@@ skipping 2155 matching lines @@
 
     FrameView* view = webframe->frame()->view();
 
     postLayoutResize(webframe);
 
     // Relayout immediately to avoid violating the rule that needsLayout()
     // isn't set at the end of a layout.
     if (view->needsLayout())
         view->layout();
 
-    // In case we didn't have a size when the top controls were updated.
-    didUpdateTopControls();
-
     m_client->didUpdateLayout();
 }
 
 void WebViewImpl::didChangeContentsSize()
 {
     pageScaleConstraintsSet().didChangeContentsSize(contentsSize(), pageScaleFactor());
 }
 
 void WebViewImpl::pageScaleFactorChanged()
 {
@@ skipping 235 matching lines @@
     const WebFloatSize& elasticOverscrollDelta,
     float pageScaleDelta,
     float topControlsShownRatioDelta)
 {
     if (!mainFrameImpl())
         return;
     FrameView* frameView = mainFrameImpl()->frameView();
     if (!frameView)
         return;
 
+    ScrollableArea* layoutViewport = frameView->layoutViewportScrollableArea();
+    VisualViewport& visualViewport = page()->frameHost().visualViewport();
+
+    // Store the desired offsets for visual and layout viewports before setting
+    // the top controls ratio since doing so will change the bounds and move the
+    // viewports to keep the offsets valid. The compositor may have already done
+    // that so we don't want to double apply the deltas here.
+    FloatPoint visualViewportOffset = visualViewport.visibleRect().location();
+    visualViewportOffset.move(
+        visualViewportDelta.width,
+        visualViewportDelta.height);
+    DoublePoint layoutViewportPosition = layoutViewport->scrollPositionDouble()
+        + DoubleSize(layoutViewportDelta.width, layoutViewportDelta.height);
+
     topControls().setShownRatio(topControls().shownRatio() + topControlsShownRatioDelta);
 
-    FloatPoint visualViewportOffset = page()->frameHost().visualViewport().visibleRect().location();
-    visualViewportOffset.move(visualViewportDelta.width, visualViewportDelta.height);
     setPageScaleFactorAndLocation(pageScaleFactor() * pageScaleDelta, visualViewportOffset);
 
     if (pageScaleDelta != 1) {
         m_doubleTapZoomPending = false;
-        page()->frameHost().visualViewport().userDidChangeScale();
+        visualViewport.userDidChangeScale();
     }
 
     m_elasticOverscroll += elasticOverscrollDelta;
     frameView->didUpdateElasticOverscroll();
 
-    ScrollableArea* layoutViewport = frameView->layoutViewportScrollableArea();
-
-    DoublePoint layoutViewportPosition = layoutViewport->scrollPositionDouble()
-        + DoubleSize(layoutViewportDelta.width, layoutViewportDelta.height);
-
     if (layoutViewport->scrollPositionDouble() != layoutViewportPosition) {
         layoutViewport->setScrollPosition(layoutViewportPosition, CompositorScroll);
         if (DocumentLoader* documentLoader = mainFrameImpl()->frame()->loader().documentLoader())
             documentLoader->initialScrollState().wasScrolledByUser = true;
     }
 }
 
 void WebViewImpl::recordFrameTimingEvent(FrameTimingEventType eventType, int64_t FrameId, const WebVector<WebFrameTimingEvent>& events)
 {
     Frame* frame = m_page ? m_page->mainFrame() : 0;
@@ skipping 202 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink