diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 13:31:45 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 13:31:45 +0000 |
| commit | 64a5a8cb4268b15ea6ec734a00114ef30f9381fb (patch) | |
| tree | acf46e4070851d9be1ca5dfcd01d0ac0af557f71 /ui/events/gestures/gesture_sequence.cc | |
| parent | 676c561eae941ee83445be73fb9148859bfcdf64 (diff) | |
| download | chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.zip chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.tar.gz chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.tar.bz2 | |
Gesture recognizer must be a singleton accross all aura::RootWindows
BUG=279317
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=229753
R=sadrul@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/25350006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/events/gestures/gesture_sequence.cc')
| -rw-r--r-- | ui/events/gestures/gesture_sequence.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/events/gestures/gesture_sequence.cc b/ui/events/gestures/gesture_sequence.cc index d364ed2..e728cbc 100644 --- a/ui/events/gestures/gesture_sequence.cc +++ b/ui/events/gestures/gesture_sequence.cc @@ -381,14 +381,15 @@ void UpdateGestureEventLatencyInfo(const TouchEvent& event, //////////////////////////////////////////////////////////////////////////////// // GestureSequence Public: -GestureSequence::GestureSequence(GestureEventHelper* helper) +GestureSequence::GestureSequence(GestureSequenceDelegate* delegate) : state_(GS_NO_GESTURE), flags_(0), pinch_distance_start_(0.f), pinch_distance_current_(0.f), scroll_type_(ST_FREE), point_count_(0), - helper_(helper) { + delegate_(delegate) { + CHECK(delegate_); } GestureSequence::~GestureSequence() { @@ -1057,7 +1058,7 @@ void GestureSequence::AppendLongPressGestureEvent() { flags_, base::Time::FromDoubleT(point->last_touch_time()), 1 << point->touch_id())); - helper_->DispatchLongPressGestureEvent(gesture.get()); + delegate_->DispatchLongPressGestureEvent(gesture.get()); } void GestureSequence::AppendLongTapGestureEvent(const GesturePoint& point, |