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

Unified Diff: ui/events/gesture_detection/touch_disposition_gesture_filter.cc

Issue 280593003: Send TapCancel when a second finger is pressed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address jdduke's comments. Created 6 years, 7 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 | « no previous file | ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/touch_disposition_gesture_filter.cc
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
index a1b454398d5641af7ab09d557706867340deec49..2006c2add219e409988a2b2c78db4100f1c95963 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
@@ -215,6 +215,8 @@ void TouchDispositionGestureFilter::FilterAndSendPacket(
CancelTapIfNecessary();
EndScrollIfNecessary();
CancelFlingIfNecessary();
+ } else if (packet.gesture_source() == GestureEventDataPacket::TOUCH_START) {
+ CancelTapIfNecessary();
}
for (size_t i = 0; i < packet.gesture_count(); ++i) {
@@ -264,6 +266,7 @@ void TouchDispositionGestureFilter::SendGesture(const GestureEventData& event) {
needs_show_press_event_ = false;
break;
case ET_GESTURE_TAP:
+ DCHECK(needs_tap_ending_event_);
if (needs_show_press_event_) {
GestureEventData show_press_event(event);
show_press_event.type = ET_GESTURE_SHOW_PRESS;
« no previous file with comments | « no previous file | ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698