Keep top controls visible if SHOW is called right after HIDE.

cc/input/top_controls_manager.cc

 // Copyright 2013 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 "cc/input/top_controls_manager.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 78 matching lines @@
   permitted_state_ = constraints;
 
   // Don't do anything if it doesn't matter which state the controls are in.
   if (constraints == BOTH && current == BOTH)
     return;
 
   // Don't do anything if there is no change in offset.
   float final_shown_ratio = 1.f;
   if (constraints == HIDDEN || current == HIDDEN)
     final_shown_ratio = 0.f;
-  if (final_shown_ratio == TopControlsShownRatio())
+  if (final_shown_ratio == TopControlsShownRatio()) {
+    ResetAnimations();
     return;
+  }
 
   if (animate) {
     SetupAnimation(final_shown_ratio ? SHOWING_CONTROLS : HIDING_CONTROLS);
   } else {
     ResetAnimations();
     client_->SetCurrentTopControlsShownRatio(final_shown_ratio);
   }
 }
 
 void TopControlsManager::ScrollBegin() {
@@ skipping 136 matching lines @@
   return (animation_direction_ == SHOWING_CONTROLS && new_ratio >= 1.f) ||
          (animation_direction_ == HIDING_CONTROLS && new_ratio <= 0.f);
 }
 
 void TopControlsManager::ResetBaseline() {
   accumulated_scroll_delta_ = 0.f;
   baseline_content_offset_ = ContentTopOffset();
 }
 
 }  // namespace cc