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

Unified Diff: ui/events/blink/input_handler_proxy.cc

Issue 2479023003: Remove is_fling flag for fling intervention (Closed)
Patch Set: Make enum explicitly Created 4 years, 1 month 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 | « ui/events/blink/input_handler_proxy.h ('k') | ui/events/blink/input_handler_proxy_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/input_handler_proxy.cc
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 4f9f342c0be85f6292a25cdd0c79604342f4ada8..18baa4cf33d4dd8cbcc16699b89b28e4d6451d49 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -812,7 +812,6 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureFlingStart(
TRACE_EVENT_SCOPE_THREAD);
gesture_scroll_on_impl_thread_ = false;
fling_may_be_active_on_main_thread_ = true;
- client_->DidStartFlinging();
return DID_NOT_HANDLE;
}
case cc::InputHandler::SCROLL_IGNORED: {
@@ -892,6 +891,10 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
result = DID_HANDLE_NON_BLOCKING;
}
+ bool is_fling_on_impl = fling_curve_ && !fling_may_be_active_on_main_thread_;
+ if (result == DID_NOT_HANDLE && is_fling_on_impl)
+ result = DID_NOT_HANDLE_NON_BLOCKING_DUE_TO_FLING;
+
return result;
}
@@ -1327,9 +1330,11 @@ bool InputHandlerProxy::TouchpadFlingScroll(
// the subarea but then is flung "under" the pointer.
client_->TransferActiveWheelFlingAnimation(fling_parameters_);
fling_may_be_active_on_main_thread_ = true;
- client_->DidStartFlinging();
CancelCurrentFlingWithoutNotifyingClient();
break;
+ case DID_NOT_HANDLE_NON_BLOCKING_DUE_TO_FLING:
+ NOTREACHED();
+ return false;
}
return false;
« no previous file with comments | « ui/events/blink/input_handler_proxy.h ('k') | ui/events/blink/input_handler_proxy_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698