| Index: content/renderer/input/input_handler_proxy.cc
|
| diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc
|
| index fa95881c2f1528239cb7f92f94a60e52d056d045..c2d3ca7ca268b2a34e3a73da420115f3f64cb0e5 100644
|
| --- a/content/renderer/input/input_handler_proxy.cc
|
| +++ b/content/renderer/input/input_handler_proxy.cc
|
| @@ -352,6 +352,7 @@ void InputHandlerProxy::Animate(base::TimeTicks time) {
|
|
|
| void InputHandlerProxy::MainThreadHasStoppedFlinging() {
|
| fling_may_be_active_on_main_thread_ = false;
|
| + client_->DidStopFlinging();
|
| }
|
|
|
| void InputHandlerProxy::DidOverscroll(const cc::DidOverscrollParams& params) {
|
| @@ -388,6 +389,8 @@ bool InputHandlerProxy::CancelCurrentFling() {
|
| fling_curve_.reset();
|
| gesture_scroll_on_impl_thread_ = false;
|
| fling_parameters_ = blink::WebActiveWheelFlingParameters();
|
| + if (had_fling_animation)
|
| + client_->DidStopFlinging();
|
| return had_fling_animation;
|
| }
|
|
|
|
|