summaryrefslogtreecommitdiffstats
path: root/ui/views/widget/widget.cc
diff options
context:
space:
mode:
authorloislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 06:33:53 +0000
committerloislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 06:33:53 +0000
commit735dce06ed30b61b49de10642f45566ec612a5d5 (patch)
tree705a899a8154e25c0562ebf544f96d7fc08ab806 /ui/views/widget/widget.cc
parentc02581ed5de3df60501f14a1555f8820867548ba (diff)
downloadchromium_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 'ui/views/widget/widget.cc')
-rw-r--r--ui/views/widget/widget.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 2231378..7626e96 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -1116,11 +1116,9 @@ ui::GestureStatus Widget::OnGestureEvent(const GestureEvent& event) {
// dragging) may explicitly capture.
break;
- case ui::ET_GESTURE_END:
- if (event.delta_x() == 1) {
- is_touch_down_ = false;
- ReleaseCapture();
- }
+ case ui::ET_GESTURE_TAP_UP:
+ is_touch_down_ = false;
+ ReleaseCapture();
break;
default: