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

third_party/WebKit/Source/web/WebViewImpl.cpp

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 c91b67354a38fa03a4539263b7a1791a8176566d..97b239bca9e784930ef1cdd502f10efc62b75382 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -1778,7 +1778,6 @@
   // viewport with the browser controls shown.
   IntSize ICBSize = m_size;
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
-      browserControls().permittedState() == WebBrowserControlsBoth &&
       !browserControls().shrinkViewport())
     ICBSize.expand(0, -browserControls().height());
 
@@ -1800,19 +1799,7 @@
 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);
@@ -1860,7 +1847,8 @@
   return page()->frameHost().browserControls();
 }
 
-void WebViewImpl::resizeViewWhileAnchored(float browserControlsHeight,
+void WebViewImpl::resizeViewWhileAnchored(FrameView* view,
+                                          float browserControlsHeight,
                                           bool browserControlsShrinkLayout) {
   DCHECK(mainFrameImpl());
 
@@ -1924,10 +1912,12 @@
   if (isRotation) {
     RotationViewportAnchor anchor(*view, visualViewport, viewportAnchorCoords,
                                   pageScaleConstraintsSet());
-    resizeViewWhileAnchored(browserControlsHeight, browserControlsShrinkLayout);
+    resizeViewWhileAnchored(view, browserControlsHeight,
+                            browserControlsShrinkLayout);
   } else {
     ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor);
-    resizeViewWhileAnchored(browserControlsHeight, browserControlsShrinkLayout);
+    resizeViewWhileAnchored(view, browserControlsHeight,
+                            browserControlsShrinkLayout);
   }
   sendResizeEventAndRepaint();
 }