Reland of Use full viewport height for layout if URL bar is locked shown or hidden.

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 1760 matching lines @@
   page()->frameHost().visualViewport().setSize(newSize);
   page()->frameHost().visualViewport().clampToBoundaries();
 }
 
 void WebViewImpl::performResize() {
   // We'll keep the initial containing block size from changing when the top
   // controls hide so that the ICB will always be the same size as the
   // viewport with the browser controls shown.
   IntSize ICBSize = m_size;
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
+      browserControls().permittedState() == WebBrowserControlsBoth &&
       !browserControls().shrinkViewport())
     ICBSize.expand(0, -browserControls().height());
 
   pageScaleConstraintsSet().didChangeInitialContainingBlockSize(ICBSize);
 
   updatePageDefinedViewportConstraints(
       mainFrameImpl()->frame()->document()->viewportDescription());
   updateMainFrameLayoutSize();
 
   page()->frameHost().visualViewport().setSize(m_size);
 
   if (mainFrameImpl()->frameView()) {
     mainFrameImpl()->frameView()->setInitialViewportSize(ICBSize);
     if (!mainFrameImpl()->frameView()->needsLayout())
       postLayoutResize(mainFrameImpl());
   }
 }
 
 void WebViewImpl::updateBrowserControlsState(WebBrowserControlsState constraint,
                                              WebBrowserControlsState current,
                                              bool animate) {
+  WebBrowserControlsState oldPermittedState =
+      browserControls().permittedState();
+
   browserControls().updateConstraintsAndState(constraint, current, animate);
 
+  // If the controls are going from a locked to an unlocked state, or
+  // vice-versa, then we need to force a recompute of the ICB size since that
+  // depends on the permitted browser controls state.
+  if (oldPermittedState != constraint &&
+      (oldPermittedState == WebBrowserControlsBoth ||
+       constraint == WebBrowserControlsBoth)) {
+    performResize();
+  }
+
   if (m_layerTreeView)
     m_layerTreeView->updateBrowserControlsState(constraint, current, animate);
 }
 
 void WebViewImpl::didUpdateBrowserControls() {
   if (m_layerTreeView) {
     m_layerTreeView->setBrowserControlsShownRatio(
         browserControls().shownRatio());
     m_layerTreeView->setBrowserControlsHeight(
         browserControls().height(), browserControls().shrinkViewport());
@@ skipping 26 matching lines @@
     // scale, its adjustment must also be scaled by the minimum scale.
     view->setBrowserControlsViewportAdjustment(
         browserControlsViewportAdjustment / minimumPageScaleFactor());
   }
 }
 
 BrowserControls& WebViewImpl::browserControls() {
   return page()->frameHost().browserControls();
 }
 
-void WebViewImpl::resizeViewWhileAnchored(FrameView* view,
-                                          float browserControlsHeight,
+void WebViewImpl::resizeViewWhileAnchored(float browserControlsHeight,
                                           bool browserControlsShrinkLayout) {
   DCHECK(mainFrameImpl());
 
   browserControls().setHeight(browserControlsHeight,
                               browserControlsShrinkLayout);
 
   {
     // Avoids unnecessary invalidations while various bits of state in
     // TextAutosizer are updated.
     TextAutosizer::DeferUpdatePageInfo deferUpdatePageInfo(page());
@@ skipping 43 matching lines @@
   bool isRotation =
       page()->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, browserControlsHeight,
-                            browserControlsShrinkLayout);
+    resizeViewWhileAnchored(browserControlsHeight, browserControlsShrinkLayout);
   } else {
     ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor);
-    resizeViewWhileAnchored(view, browserControlsHeight,
-                            browserControlsShrinkLayout);
+    resizeViewWhileAnchored(browserControlsHeight, browserControlsShrinkLayout);
   }
   sendResizeEventAndRepaint();
 }
 
 void WebViewImpl::resize(const WebSize& newSize) {
   if (m_shouldAutoResize || m_size == newSize)
     return;
 
   resizeWithBrowserControls(newSize, browserControls().height(),
                             browserControls().shrinkViewport());
@@ skipping 2271 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink