Eager Gesture Recognizer (WIP)

ui/events/gestures/gesture_recognizer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/gestures/gesture_recognizer_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/event.h"
@@ skipping 145 matching lines @@
     if (i->second == consumer)
       ids.push_back(std::make_pair(i->first, i->second));
   }
   CancelTouches(&ids);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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;
 }
 
 void GestureRecognizerImpl::SetupTargets(const TouchEvent& event,
                                          GestureConsumer* target) {
   if (event.type() == ui::ET_TOUCH_RELEASED ||
       event.type() == ui::ET_TOUCH_CANCELLED) {
     touch_id_target_.erase(event.touch_id());
@@ skipping 14 matching lines @@
                            ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f);
     GestureEventHelper* helper = FindDispatchHelperForConsumer(target);
     if (helper)
       helper->DispatchCancelTouchEvent(&touch_event);
     touches->erase(touches->begin());
   }
 }
 
 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) {
   if (consumer_sequence_.count(consumer)) {
     delete consumer_sequence_[consumer];
     consumer_sequence_.erase(consumer);
   }
 
   RemoveConsumerFromMap(consumer, &touch_id_target_);
   RemoveConsumerFromMap(consumer, &touch_id_target_for_gestures_);
 }
 
 void GestureRecognizerImpl::AddGestureEventHelper(GestureEventHelper* helper) {
   helpers_.push_back(helper);
 }
 
 void GestureRecognizerImpl::RemoveGestureEventHelper(
     GestureEventHelper* helper) {
   std::vector<GestureEventHelper*>::iterator it = std::find(helpers_.begin(),
       helpers_.end(), helper);
   if (it != helpers_.end())
     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;
   for (it = helpers_.begin(); it != helpers_.end(); ++it) {
     if ((*it)->CanDispatchToConsumer(consumer))
       return (*it);
   }
   return NULL;
 }
 
@@ skipping 18 matching lines @@
   std::vector<GestureEventHelper*>::iterator it;
   for (it = helpers.begin(); it != helpers.end(); ++it)
     gesture_recognizer->AddGestureEventHelper(*it);
 
   helpers.clear();
   g_gesture_recognizer_instance =
       static_cast<GestureRecognizerImpl*>(gesture_recognizer);
 }
 
 }  // namespace ui