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

Side by Side Diff: ui/events/gestures/gesture_sequence.h

Issue 133273013: Consuming any touch move before SCROLL_START prevents the scroll from occuring in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address sadrul's comments. Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/events/gestures/gesture_sequence.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_GESTURES_GESTURE_SEQUENCE_H_ 5 #ifndef UI_EVENTS_GESTURES_GESTURE_SEQUENCE_H_
6 #define UI_EVENTS_GESTURES_GESTURE_SEQUENCE_H_ 6 #define UI_EVENTS_GESTURES_GESTURE_SEQUENCE_H_
7 7
8 #include "base/timer/timer.h" 8 #include "base/timer/timer.h"
9 #include "ui/events/event_constants.h" 9 #include "ui/events/event_constants.h"
10 #include "ui/events/gestures/gesture_point.h" 10 #include "ui/events/gestures/gesture_point.h"
11 #include "ui/events/gestures/gesture_recognizer.h" 11 #include "ui/events/gestures/gesture_recognizer.h"
12 #include "ui/gfx/rect.h" 12 #include "ui/gfx/rect.h"
13 13
14 namespace ui { 14 namespace ui {
15 class TouchEvent; 15 class TouchEvent;
16 class GestureEvent; 16 class GestureEvent;
17 17
18 // Gesture state. 18 // Gesture state.
19 enum GestureState { 19 enum GestureState {
20 GS_NO_GESTURE, 20 GS_NO_GESTURE,
21 GS_PENDING_SYNTHETIC_CLICK, 21 GS_PENDING_SYNTHETIC_CLICK,
22 // One finger is down: tap could occur, but scroll cannot until the number of
23 // active touch points changes.
22 GS_PENDING_SYNTHETIC_CLICK_NO_SCROLL, 24 GS_PENDING_SYNTHETIC_CLICK_NO_SCROLL,
25 // One finger is down: no gestures can occur until the number of active touch
26 // points changes.
27 GS_SYNTHETIC_CLICK_ABORTED,
23 GS_SCROLL, 28 GS_SCROLL,
24 GS_PINCH, 29 GS_PINCH,
25 GS_PENDING_TWO_FINGER_TAP, 30 GS_PENDING_TWO_FINGER_TAP,
26 GS_PENDING_TWO_FINGER_TAP_NO_PINCH, 31 GS_PENDING_TWO_FINGER_TAP_NO_PINCH,
27 GS_PENDING_PINCH, 32 GS_PENDING_PINCH,
28 GS_PENDING_PINCH_NO_PINCH, 33 GS_PENDING_PINCH_NO_PINCH,
29 }; 34 };
30 35
31 enum ScrollType { 36 enum ScrollType {
32 ST_FREE, 37 ST_FREE,
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 gfx::Point last_touch_location_; 241 gfx::Point last_touch_location_;
237 242
238 GestureSequenceDelegate* delegate_; 243 GestureSequenceDelegate* delegate_;
239 244
240 DISALLOW_COPY_AND_ASSIGN(GestureSequence); 245 DISALLOW_COPY_AND_ASSIGN(GestureSequence);
241 }; 246 };
242 247
243 } // namespace ui 248 } // namespace ui
244 249
245 #endif // UI_EVENTS_GESTURES_GESTURE_SEQUENCE_H_ 250 #endif // UI_EVENTS_GESTURES_GESTURE_SEQUENCE_H_
OLDNEW
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/events/gestures/gesture_sequence.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698