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

Unified Diff: ui/events/gestures/gesture_recognizer_impl.cc

Issue 680413006: Re-enable Eager Gesture Recognition on Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address sadrul's comments. Created 6 years 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/gestures/gesture_recognizer_impl.h ('k') | ui/events/gestures/gesture_recognizer_impl_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/gesture_recognizer_impl.cc
diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc
index ae5f89efdd96e89e91804ad5a193784f6dcfff61..950bec9b3a93e8378aac99a092a457f016532f8c 100644
--- a/ui/events/gestures/gesture_recognizer_impl.cc
+++ b/ui/events/gestures/gesture_recognizer_impl.cc
@@ -249,25 +249,24 @@ bool GestureRecognizerImpl::ProcessTouchEventPreDispatch(
}
GestureRecognizer::Gestures*
-GestureRecognizerImpl::ProcessTouchEventPostDispatch(
+GestureRecognizerImpl::AckAsyncTouchEvent(
const TouchEvent& event,
ui::EventResult result,
GestureConsumer* consumer) {
GestureProviderAura* gesture_provider =
GetGestureProviderForConsumer(consumer);
- gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
+ gesture_provider->OnAsyncTouchEventAck(result != ER_UNHANDLED);
return gesture_provider->GetAndResetPendingGestures();
}
-GestureRecognizer::Gestures* GestureRecognizerImpl::ProcessTouchEventOnAsyncAck(
- const TouchEvent& event,
+GestureRecognizer::Gestures* GestureRecognizerImpl::AckSyncTouchEvent(
+ const uint64 unique_event_id,
ui::EventResult result,
GestureConsumer* consumer) {
- if (result & ui::ER_CONSUMED)
- return NULL;
GestureProviderAura* gesture_provider =
GetGestureProviderForConsumer(consumer);
- gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
+ gesture_provider->OnSyncTouchEventAck(unique_event_id,
+ result != ER_UNHANDLED);
return gesture_provider->GetAndResetPendingGestures();
}
« no previous file with comments | « ui/events/gestures/gesture_recognizer_impl.h ('k') | ui/events/gestures/gesture_recognizer_impl_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698