Don't set shownRatio in main thread top controls on animated state change.

third_party/WebKit/Source/core/frame/TopControls.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/TopControls.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/VisualViewport.h"
 #include "core/page/ChromeClient.h"
 #include "platform/geometry/FloatSize.h"
@@ skipping 77 matching lines @@
     shownRatio = std::min(shownRatio, 1.f);
     shownRatio = std::max(shownRatio, 0.f);
 
     if (m_shownRatio == shownRatio)
         return;
 
     m_shownRatio = shownRatio;
     m_frameHost->chromeClient().didUpdateTopControls();
 }
 
-void TopControls::updateConstraints(WebTopControlsState constraints)
+void TopControls::updateConstraintsAndState(
+    WebTopControlsState constraints,
+    WebTopControlsState current,
+    bool animate)
 {
     m_permittedState = constraints;
 
-    if (m_permittedState == WebTopControlsShown)
+    DCHECK(!(constraints == WebTopControlsShown && current == WebTopControlsHidden));
+    DCHECK(!(constraints == WebTopControlsHidden && current == WebTopControlsShown));
+
+    // If the change should be animated, let the impl thread drive the change.
+    // Otherwise, immediately set the shown ratio so we don't have to wait for
+    // a commit from the impl thread.
+    if (animate)
+        return;
+
+    if (constraints == WebTopControlsBoth && current == WebTopControlsBoth)
+        return;
+
+    if (constraints == WebTopControlsHidden || current == WebTopControlsHidden)
+        setShownRatio(0.f);
+    else
         setShownRatio(1.f);
-    else if (m_permittedState == WebTopControlsHidden)
-        setShownRatio(0.f);
 }
 
 void TopControls::setHeight(float height, bool shrinkViewport)
 {
     if (m_height == height && m_shrinkViewport == shrinkViewport)
         return;
 
     m_height = height;
     m_shrinkViewport = shrinkViewport;
     m_frameHost->chromeClient().didUpdateTopControls();
 }
 
 } // namespace blink