Eager Gesture Recognition on 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 270 matching lines @@
 
 void GestureRecognizerImpl::DispatchGestureEvent(GestureEvent* event) {
   GestureConsumer* consumer = GetTargetForGestureEvent(*event);
   if (consumer) {
     GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer);
     if (helper)
       helper->DispatchGestureEvent(event);
   }
 }
 
-ScopedVector<GestureEvent>* GestureRecognizerImpl::ProcessTouchEventForGesture(
+bool GestureRecognizerImpl::ProcessTouchEventForGesture(
+    const TouchEvent& event,
+    GestureConsumer* target) {
+  SetupTargets(event, target);
+
+  if (event.result() & ER_CONSUMED)
+    return false;
+
+  GestureProviderAura* gesture_provider = GetGestureProviderForConsumer(target);
+  return gesture_provider->OnTouchEvent(event);
+}
+
+ScopedVector<GestureEvent>*
+GestureRecognizerImpl::ProcessTouchEventForGestureForOldAuraGR(
     const TouchEvent& event,
     ui::EventResult result,
     GestureConsumer* target) {
   SetupTargets(event, target);
+  GestureSequence* gesture_sequence = GetGestureSequenceForConsumer(target);
+  return gesture_sequence->ProcessTouchEventForGesture(event, result);
+}
 
-  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)) {
-        gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
-        return gesture_provider->GetAndResetPendingGestures();
-      }
-    }
-    return NULL;
-  }
+ScopedVector<GestureEvent>* GestureRecognizerImpl::AckTouchEventForGesture(
+    ui::EventResult result,
+    GestureConsumer* target) {
+  DCHECK(use_unified_gesture_detector_);
+  GestureProviderAura* gesture_provider = GetGestureProviderForConsumer(target);
+  gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
+  return gesture_provider->GetAndResetPendingGestures();
 }
 
 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];
@@ skipping 70 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