Index: ui/events/gestures/gesture_recognizer_impl.cc |
diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc |
index 4a599345c84e4dd71e9081377c4c01c584a33679..0ba6210b7242521ef9a1237017d2c51c4478a149 100644 |
--- a/ui/events/gestures/gesture_recognizer_impl.cc |
+++ b/ui/events/gestures/gesture_recognizer_impl.cc |
@@ -163,18 +163,18 @@ void GestureRecognizerImpl::CancelActiveTouches( |
// GestureRecognizerImpl, protected: |
GestureSequence* GestureRecognizerImpl::CreateSequence( |
- GestureSequenceDelegate* delegate) { |
- return new GestureSequence(delegate); |
+ GestureEventQueueTimerInterface* geq_timers) { |
+ return new GestureSequence(geq_timers); |
} |
//////////////////////////////////////////////////////////////////////////////// |
// GestureRecognizerImpl, private: |
GestureSequence* GestureRecognizerImpl::GetGestureSequenceForConsumer( |
- GestureConsumer* consumer) { |
+ GestureConsumer* consumer, GestureEventQueueTimerInterface* geq_timers) { |
GestureSequence* gesture_sequence = consumer_sequence_[consumer]; |
if (!gesture_sequence) { |
- gesture_sequence = CreateSequence(this); |
+ gesture_sequence = CreateSequence(geq_timers); |
consumer_sequence_[consumer] = gesture_sequence; |
} |
return gesture_sequence; |
@@ -209,11 +209,12 @@ void GestureRecognizerImpl::CancelTouches( |
GestureSequence::Gestures* GestureRecognizerImpl::ProcessTouchEventForGesture( |
const TouchEvent& event, |
- ui::EventResult result, |
- GestureConsumer* target) { |
+ GestureConsumer* target, |
+ GestureEventQueueTimerInterface* geq_timers) { |
SetupTargets(event, target); |
- GestureSequence* gesture_sequence = GetGestureSequenceForConsumer(target); |
- return gesture_sequence->ProcessTouchEventForGesture(event, result); |
+ GestureSequence* gesture_sequence = |
+ GetGestureSequenceForConsumer(target, geq_timers); |
+ return gesture_sequence->ProcessTouchEventForGesture(event); |
} |
void GestureRecognizerImpl::CleanupStateForConsumer(GestureConsumer* consumer) { |
@@ -238,15 +239,6 @@ void GestureRecognizerImpl::RemoveGestureEventHelper( |
helpers_.erase(it); |
} |
-void GestureRecognizerImpl::DispatchPostponedGestureEvent(GestureEvent* event) { |
- GestureConsumer* consumer = GetTargetForGestureEvent(*event); |
- if (consumer) { |
- GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer); |
- if (helper) |
- helper->DispatchPostponedGestureEvent(event); |
- } |
-} |
- |
GestureEventHelper* GestureRecognizerImpl::FindDispatchHelperForConsumer( |
GestureConsumer* consumer) { |
std::vector<GestureEventHelper*>::iterator it; |