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 e1d6dd34ab31259d8ed0e9d5e345007106005c38..1e302bb3c11fac9f2c141a024248ddc315b9db9c 100644 |
--- a/content/renderer/input/input_handler_proxy.cc |
+++ b/content/renderer/input/input_handler_proxy.cc |
@@ -403,7 +403,7 @@ InputHandlerProxy::HandleGestureFling( |
WebPoint(gesture_event.globalX, gesture_event.globalY); |
fling_parameters_.modifiers = gesture_event.modifiers; |
fling_parameters_.sourceDevice = gesture_event.sourceDevice; |
- input_handler_->SetNeedsAnimate(); |
+ input_handler_->SetNeedsAnimateFling(); |
return DID_HANDLE; |
} |
case cc::InputHandler::ScrollUnknown: |
@@ -585,7 +585,7 @@ void InputHandlerProxy::FlingBoostCancelAndResumeScrollingIfNecessary() { |
} |
} |
-void InputHandlerProxy::Animate(base::TimeTicks time) { |
+void InputHandlerProxy::AnimateFling(base::TimeTicks time) { |
if (!fling_curve_) |
return; |
@@ -606,7 +606,7 @@ void InputHandlerProxy::Animate(base::TimeTicks time) { |
monotonic_time_sec >= fling_parameters_.startTime + |
kMaxSecondsFromFlingTimestampToFirstAnimate) { |
fling_parameters_.startTime = monotonic_time_sec; |
- input_handler_->SetNeedsAnimate(); |
+ input_handler_->SetNeedsAnimateFling(); |
return; |
} |
} |
@@ -619,7 +619,7 @@ void InputHandlerProxy::Animate(base::TimeTicks time) { |
fling_is_active = false; |
if (fling_is_active) { |
- input_handler_->SetNeedsAnimate(); |
+ input_handler_->SetNeedsAnimateFling(); |
} else { |
TRACE_EVENT_INSTANT0("input", |
"InputHandlerProxy::animate::flingOver", |