content/renderer/input/input_handler_proxy.cc - Issue 1063853005: Unify Android Webview and Chrome's fling

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1063853005: Unify Android Webview and Chrome's fling (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master

Patch Set: add proguard Created 5 years, 6 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') | content/renderer/input/input_handler_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 a918e9b530854ff1cd510a6e2e749875848bae99..e8e8f37dfc1abf5318c4cfa852cfd4e5a909e0d8 100644

--- a/content/renderer/input/input_handler_proxy.cc

+++ b/content/renderer/input/input_handler_proxy.cc

@@ -419,7 +419,9 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(

InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureScrollBegin(

const WebGestureEvent& gesture_event) {

- DCHECK(!gesture_scroll_on_impl_thread_);

+ if (gesture_scroll_on_impl_thread_)

+ CancelCurrentFling();

#ifndef NDEBUG

DCHECK(!expect_scroll_update_end_);

expect_scroll_update_end_ = true;

@@ -531,7 +533,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:

@@ -753,7 +755,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;

}

@@ -766,7 +768,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",