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

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

Issue 718153002: Indicate whether a touch event will cause scrolling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_provider_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/gesture_provider_aura.cc
diff --git a/ui/events/gestures/gesture_provider_aura.cc b/ui/events/gestures/gesture_provider_aura.cc
index 10f7ab10bb39901b73277f5679b6487340d6964b..d028aef4b27649b034b8bc37c5155426d0410d23 100644
--- a/ui/events/gestures/gesture_provider_aura.cc
+++ b/ui/events/gestures/gesture_provider_aura.cc
@@ -22,14 +22,15 @@ GestureProviderAura::GestureProviderAura(GestureProviderAuraClient* client)
GestureProviderAura::~GestureProviderAura() {}
-bool GestureProviderAura::OnTouchEvent(const TouchEvent& event) {
- int index = pointer_state_.FindPointerIndexOfId(event.touch_id());
+bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
+ DCHECK(event);
+ int index = pointer_state_.FindPointerIndexOfId(event->touch_id());
bool pointer_id_is_active = index != -1;
- if (event.type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
+ if (event->type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
// Ignore touch press events if we already believe the pointer is down.
return false;
- } else if (event.type() != ET_TOUCH_PRESSED && !pointer_id_is_active) {
+ } else if (event->type() != ET_TOUCH_PRESSED && !pointer_id_is_active) {
// We could have an active touch stream transfered to us, resulting in touch
// move or touch up events without associated touch down events. Ignore
// them.
@@ -38,18 +39,22 @@ bool GestureProviderAura::OnTouchEvent(const TouchEvent& event) {
// If this is a touchmove event, and it isn't different from the last
// event, ignore it.
- if (event.type() == ET_TOUCH_MOVED &&
- event.x() == pointer_state_.GetX(index) &&
- event.y() == pointer_state_.GetY(index)) {
+ if (event->type() == ET_TOUCH_MOVED &&
+ event->x() == pointer_state_.GetX(index) &&
+ event->y() == pointer_state_.GetY(index)) {
return false;
}
- last_touch_event_latency_info_ = *event.latency();
- pointer_state_.OnTouch(event);
+ last_touch_event_latency_info_ = *event->latency();
+ pointer_state_.OnTouch(*event);
- bool result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
- pointer_state_.CleanupRemovedTouchPoints(event);
- return result;
+ auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
+ if (!result.succeeded)
+ return false;
+
+ event->set_causes_scrolling(result.did_generate_scroll);
+ pointer_state_.CleanupRemovedTouchPoints(*event);
+ return true;
}
void GestureProviderAura::OnTouchEventAck(bool event_consumed) {
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_provider_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698