Prepare for Unified Gesture Recognizer landing in Aura

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 <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 290 matching lines @@
 
 void GestureRecognizerImpl::DispatchGestureEvent(GestureEvent* event) {
   GestureConsumer* consumer = GetTargetForGestureEvent(*event);
   if (consumer) {
     GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer);
     if (helper)
       helper->DispatchGestureEvent(event);
   }
 }
 
-GestureSequence::Gestures* GestureRecognizerImpl::ProcessTouchEventForGesture(
+ScopedVector<GestureEvent>* GestureRecognizerImpl::ProcessTouchEventForGesture(
     const TouchEvent& event,
     ui::EventResult result,
     GestureConsumer* target) {
   SetupTargets(event, target);
 
   if (!use_unified_gesture_detector_) {
     GestureSequence* gesture_sequence = GetGestureSequenceForConsumer(target);
     return gesture_sequence->ProcessTouchEventForGesture(event, result);
   } else {
     GestureProviderAura* gesture_provider =
         GetGestureProviderForConsumer(target);
     // TODO(tdresser) - detect gestures eagerly.
     if (!(result & ER_CONSUMED)) {
-      if (gesture_provider->OnTouchEvent(event))
+      if (gesture_provider->OnTouchEvent(event)) {
         gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
+        return gesture_provider->GetAndResetPendingGestures();
+      }
     }
     return NULL;
   }
 }
 
 bool GestureRecognizerImpl::CleanupStateForConsumer(
     GestureConsumer* consumer) {
   bool state_cleaned_up = false;
 
   if (!use_unified_gesture_detector_) {
     if (consumer_sequence_.count(consumer)) {
       state_cleaned_up = true;
       delete consumer_sequence_[consumer];
       consumer_sequence_.erase(consumer);
     }
   } else {
     if (consumer_gesture_provider_.count(consumer)) {
       state_cleaned_up = true;
-      // Don't immediately delete the GestureProvider, as we could be in the
-      // middle of dispatching a set of gestures.
-      base::MessageLoop::current()->DeleteSoon(
-          FROM_HERE, consumer_gesture_provider_[consumer]);
+      delete consumer_gesture_provider_[consumer];
       consumer_gesture_provider_.erase(consumer);
     }
   }
 
   state_cleaned_up |= RemoveConsumerFromMap(consumer, &touch_id_target_);
   state_cleaned_up |=
       RemoveConsumerFromMap(consumer, &touch_id_target_for_gestures_);
   return state_cleaned_up;
 }
 
@@ skipping 54 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