diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 05:56:15 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 05:56:15 +0000 |
| commit | a702758968507f0eabb01651c8a98d240934144b (patch) | |
| tree | 37b3db611c163ec2372c825dc30f8c2d1c72d4ee /ash | |
| parent | 6b87e6ca65abbb08e15430fd3b2af0bda68de83a (diff) | |
| download | chromium_src-a702758968507f0eabb01651c8a98d240934144b.zip chromium_src-a702758968507f0eabb01651c8a98d240934144b.tar.gz chromium_src-a702758968507f0eabb01651c8a98d240934144b.tar.bz2 | |
Fix TAP_DOWN gesture event:
1. GESTURE_TAP_DOWN should be sent only on the first TOUCH_PRESSED.
2. New gesture GESTURE_BEGIN shuold be sent on all TOUCH_PRESSED.
3. Rename GESTURE_TAP_UP to GESTURE_END.
BUG=131007
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10533029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/system_gesture_event_filter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index 99945ea..e7800fee 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -260,7 +260,7 @@ class SystemPinchHandler { return SYSTEM_GESTURE_END; switch (event.type()) { - case ui::ET_GESTURE_TAP_UP: { + case ui::ET_GESTURE_END: { if (event.delta_x() > kSystemPinchPoints) break; @@ -535,7 +535,7 @@ ui::GestureStatus SystemGestureEventFilter::PreHandleGestureEvent( ClearGestureHandlerForWindow(system_target); return ui::GESTURE_STATUS_CONSUMED; } else { - if (event->type() == ui::ET_GESTURE_TAP_DOWN && + if (event->type() == ui::ET_GESTURE_BEGIN && event->delta_x() >= kSystemPinchPoints) { pinch_handlers_[system_target] = new SystemPinchHandler(system_target); system_target->AddObserver(this); |