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

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

Issue 251543003: Unified Gesture Recognizer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows linking 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 unified diff | Download patch | Annotate | Revision Log
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_RECOGNIZER_IMPL_H_ 5 #ifndef UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
6 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_ 6 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "ui/events/event_constants.h" 13 #include "ui/events/event_constants.h"
14 #include "ui/events/events_export.h" 14 #include "ui/events/events_export.h"
15 #include "ui/events/gesture_detection/ui_gesture_provider.h"
15 #include "ui/events/gestures/gesture_recognizer.h" 16 #include "ui/events/gestures/gesture_recognizer.h"
16 #include "ui/events/gestures/gesture_sequence.h" 17 #include "ui/events/gestures/gesture_sequence.h"
17 #include "ui/gfx/point.h" 18 #include "ui/gfx/point.h"
18 19
19 namespace ui { 20 namespace ui {
20 class GestureConsumer; 21 class GestureConsumer;
21 class GestureEvent; 22 class GestureEvent;
22 class GestureEventHelper; 23 class GestureEventHelper;
23 class GestureSequence; 24 class GestureSequence;
24 class TouchEvent; 25 class TouchEvent;
25 26
27 // TODO(tdresser): Once the unified gesture recognition process sticks
28 // (crbug.com/332418), GestureRecognizerImpl can be cleaned up
29 // significantly.
26 class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer, 30 class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
27 public GestureSequenceDelegate { 31 public GestureSequenceDelegate,
32 public UIGestureProviderClient {
28 public: 33 public:
29 typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap; 34 typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap;
30 35
31 GestureRecognizerImpl(); 36 GestureRecognizerImpl();
32 virtual ~GestureRecognizerImpl(); 37 virtual ~GestureRecognizerImpl();
33 38
34 std::vector<GestureEventHelper*>& helpers() { return helpers_; } 39 std::vector<GestureEventHelper*>& helpers() { return helpers_; }
35 40
36 // Overridden from GestureRecognizer 41 // Overridden from GestureRecognizer
37 virtual GestureConsumer* GetTouchLockedTarget( 42 virtual GestureConsumer* GetTouchLockedTarget(
38 const TouchEvent& event) OVERRIDE; 43 const TouchEvent& event) OVERRIDE;
39 virtual GestureConsumer* GetTargetForGestureEvent( 44 virtual GestureConsumer* GetTargetForGestureEvent(
40 const GestureEvent& event) OVERRIDE; 45 const GestureEvent& event) OVERRIDE;
41 virtual GestureConsumer* GetTargetForLocation( 46 virtual GestureConsumer* GetTargetForLocation(
42 const gfx::PointF& location, int source_device_id) OVERRIDE; 47 const gfx::PointF& location, int source_device_id) OVERRIDE;
43 virtual void TransferEventsTo(GestureConsumer* current_consumer, 48 virtual void TransferEventsTo(GestureConsumer* current_consumer,
44 GestureConsumer* new_consumer) OVERRIDE; 49 GestureConsumer* new_consumer) OVERRIDE;
45 virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer, 50 virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer,
46 gfx::PointF* point) OVERRIDE; 51 gfx::PointF* point) OVERRIDE;
47 virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE; 52 virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE;
48 53
49 protected: 54 protected:
50 virtual GestureSequence* CreateSequence(GestureSequenceDelegate* delegate);
51 virtual GestureSequence* GetGestureSequenceForConsumer(GestureConsumer* c); 55 virtual GestureSequence* GetGestureSequenceForConsumer(GestureConsumer* c);
56 virtual UIGestureProvider* GetGestureProviderForConsumer(GestureConsumer* c);
57 virtual GestureSequence* CreateSequence(
58 ui::GestureSequenceDelegate* delegate);
52 59
53 private: 60 private:
54 // Sets up the target consumer for gestures based on the touch-event. 61 // Sets up the target consumer for gestures based on the touch-event.
55 void SetupTargets(const TouchEvent& event, GestureConsumer* consumer); 62 void SetupTargets(const TouchEvent& event, GestureConsumer* consumer);
56 void CancelTouches(std::vector<std::pair<int, GestureConsumer*> >* touches); 63 void CancelTouches(std::vector<std::pair<int, GestureConsumer*> >* touches);
57 64
65 void DispatchGestureEvent(GestureEvent* event);
66
58 // Overridden from GestureRecognizer 67 // Overridden from GestureRecognizer
59 virtual Gestures* ProcessTouchEventForGesture( 68 virtual Gestures* ProcessTouchEventForGesture(
60 const TouchEvent& event, 69 const TouchEvent& event,
61 ui::EventResult result, 70 ui::EventResult result,
62 GestureConsumer* target) OVERRIDE; 71 GestureConsumer* target) OVERRIDE;
63 virtual bool CleanupStateForConsumer(GestureConsumer* consumer) 72 virtual bool CleanupStateForConsumer(GestureConsumer* consumer)
64 OVERRIDE; 73 OVERRIDE;
65 virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE; 74 virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
66 virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE; 75 virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
67 76
68 // Overridden from ui::GestureSequenceDelegate. 77 // Overridden from ui::GestureSequenceDelegate.
69 virtual void DispatchPostponedGestureEvent(GestureEvent* event) OVERRIDE; 78 virtual void DispatchPostponedGestureEvent(GestureEvent* event) OVERRIDE;
70 79
80 // Overridden from UIGestureProviderClient
81 virtual void OnGestureEvent(GestureEvent* event) OVERRIDE;
82
71 // Convenience method to find the GestureEventHelper that can dispatch events 83 // Convenience method to find the GestureEventHelper that can dispatch events
72 // to a specific |consumer|. 84 // to a specific |consumer|.
73 GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer); 85 GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer);
74 86
75 std::map<GestureConsumer*, GestureSequence*> consumer_sequence_; 87 std::map<GestureConsumer*, GestureSequence*> consumer_sequence_;
88 std::map<GestureConsumer*, UIGestureProvider*> consumer_gesture_provider_;
76 89
77 // Both |touch_id_target_| and |touch_id_target_for_gestures_| map a touch-id 90 // Both |touch_id_target_| and |touch_id_target_for_gestures_| map a touch-id
78 // to its target window. touch-ids are removed from |touch_id_target_| on 91 // to its target window. touch-ids are removed from |touch_id_target_| on
79 // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL. |touch_id_target_for_gestures_| are 92 // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL. |touch_id_target_for_gestures_| are
80 // removed in ConsumerDestroyed(). 93 // removed in ConsumerDestroyed().
81 TouchIdToConsumerMap touch_id_target_; 94 TouchIdToConsumerMap touch_id_target_;
82 TouchIdToConsumerMap touch_id_target_for_gestures_; 95 TouchIdToConsumerMap touch_id_target_for_gestures_;
83 96
84 std::vector<GestureEventHelper*> helpers_; 97 std::vector<GestureEventHelper*> helpers_;
85 98
99 bool use_unified_gesture_detector_;
100
86 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl); 101 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl);
87 }; 102 };
88 103
89 // Provided only for testing: 104 // Provided only for testing:
90 EVENTS_EXPORT void SetGestureRecognizerForTesting( 105 EVENTS_EXPORT void SetGestureRecognizerForTesting(
91 GestureRecognizer* gesture_recognizer); 106 GestureRecognizer* gesture_recognizer);
92 107
93 } // namespace ui 108 } // namespace ui
94 109
95 #endif // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_ 110 #endif // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698