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

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

Issue 289373009: Support tap_count in ui::GestureProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use DCHECK_EQ 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 | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/events/gesture_event_details.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/gesture_detector.cc
diff --git a/ui/events/gesture_detection/gesture_detector.cc b/ui/events/gesture_detection/gesture_detector.cc
index fdc524bef2cf8e861fde0022dcf604db9fbf354f..ca26b7e957cbe155e15f27999ccb06e32468d4c7 100644
--- a/ui/events/gesture_detection/gesture_detector.cc
+++ b/ui/events/gesture_detection/gesture_detector.cc
@@ -187,9 +187,9 @@ GestureDetector::GestureDetector(
last_focus_y_(0),
down_focus_x_(0),
down_focus_y_(0),
- longpress_enabled_(true),
- swipe_enabled_(false),
- two_finger_tap_enabled_(false) {
+ longpress_enabled_(true),
+ swipe_enabled_(false),
+ two_finger_tap_enabled_(false) {
DCHECK(listener_);
Init(config);
}
@@ -519,14 +519,9 @@ void GestureDetector::OnTapTimeout() {
}
void GestureDetector::Cancel() {
- timeout_handler_->Stop();
+ CancelTaps();
velocity_tracker_.Clear();
- is_double_tapping_ = false;
still_down_ = false;
- always_in_tap_region_ = false;
- always_in_bigger_tap_region_ = false;
- defer_confirm_single_tap_ = false;
- in_longpress_ = false;
}
void GestureDetector::CancelTaps() {
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/events/gesture_event_details.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698