Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1519)

Unified Diff: content/renderer/input/input_handler_proxy.cc

Issue 274323004: NOT FOR LANDING - [WebView] Allow fling animation via the LayerScrollOffsetDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/android/synchronous_compositor_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f9cc75b9a80aaa2b1e80d9d0bb0ac06501b1eacd..dcc6d23ddcf6c1cbc6f0660d3f859c25e3315983 100644
--- a/content/renderer/input/input_handler_proxy.cc
+++ b/content/renderer/input/input_handler_proxy.cc
@@ -520,7 +520,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureFlingStart(
WebPoint(gesture_event.globalX, gesture_event.globalY);
fling_parameters_.modifiers = gesture_event.modifiers;
fling_parameters_.sourceDevice = gesture_event.sourceDevice;
- input_handler_->SetNeedsAnimate();
+ input_handler_->SetNeedsAnimateInput();
return DID_HANDLE;
}
case cc::InputHandler::SCROLL_UNKNOWN:
@@ -740,7 +740,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_->SetNeedsAnimateInput();
return;
}
}
@@ -753,7 +753,7 @@ void InputHandlerProxy::Animate(base::TimeTicks time) {
fling_is_active = false;
if (fling_is_active) {
- input_handler_->SetNeedsAnimate();
+ input_handler_->SetNeedsAnimateInput();
} else {
TRACE_EVENT_INSTANT0("input",
"InputHandlerProxy::animate::flingOver",
« no previous file with comments | « content/public/browser/android/synchronous_compositor_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698