diff options
| author | loislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 06:33:53 +0000 |
|---|---|---|
| committer | loislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 06:33:53 +0000 |
| commit | 735dce06ed30b61b49de10642f45566ec612a5d5 (patch) | |
| tree | 705a899a8154e25c0562ebf544f96d7fc08ab806 /ash | |
| parent | c02581ed5de3df60501f14a1555f8820867548ba (diff) | |
| download | chromium_src-735dce06ed30b61b49de10642f45566ec612a5d5.zip chromium_src-735dce06ed30b61b49de10642f45566ec612a5d5.tar.gz chromium_src-735dce06ed30b61b49de10642f45566ec612a5d5.tar.bz2 | |
It broke win aura bot
[ RUN ] WindowTest.TransferCaptureTouchEvents
.\window_unittest.cc(700): error: Value of: d1.gesture_event_count()
Actual: 2
Expected: 1
.\window_unittest.cc(710): error: Value of: d2.gesture_event_count()
Actual: 2
Expected: 1
[ FAILED ] WindowTest.TransferCaptureTouchEvents (0 ms)
Revert 140967 - 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
TBR=varunjain@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10539041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140972 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 e7800fee..99945ea 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_END: { + case ui::ET_GESTURE_TAP_UP: { 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_BEGIN && + if (event->type() == ui::ET_GESTURE_TAP_DOWN && event->delta_x() >= kSystemPinchPoints) { pinch_handlers_[system_target] = new SystemPinchHandler(system_target); system_target->AddObserver(this); |