| Index: cc/input/top_controls_manager.cc
|
| diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc
|
| index 871d9e6f69c9a2098617564c0d257c8148a93d4a..ea21e8b8872e654ca9e2afe6b4c994f202160438 100644
|
| --- a/cc/input/top_controls_manager.cc
|
| +++ b/cc/input/top_controls_manager.cc
|
| @@ -128,6 +128,8 @@ gfx::Vector2dF TopControlsManager::ScrollBy(
|
| void TopControlsManager::ScrollEnd() {
|
| DCHECK(!pinch_gesture_active_);
|
| StartAnimationIfNecessary();
|
| + if (!top_controls_animation_)
|
| + client_->DidFinishTopControlsGesture();
|
| }
|
|
|
| void TopControlsManager::PinchBegin() {
|
| @@ -173,8 +175,10 @@ gfx::Vector2dF TopControlsManager::Animate(base::TimeTicks monotonic_time) {
|
| }
|
|
|
| void TopControlsManager::ResetAnimations() {
|
| - if (top_controls_animation_)
|
| + if (top_controls_animation_) {
|
| top_controls_animation_.reset();
|
| + client_->DidFinishTopControlsGesture();
|
| + }
|
|
|
| animation_direction_ = NO_ANIMATION;
|
| }
|
|
|