Eager Gesture Recognition on Aura

ui/events/gestures/gesture_recognizer_impl.cc

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 38c07f8ecacd6d06debe667e77c9ae5a40de563e..310e10399ec0eea81f5c40ae59e4f357bdde3e6f 100644
--- a/ui/events/gestures/gesture_recognizer_impl.cc
+++ b/ui/events/gestures/gesture_recognizer_impl.cc
@@ -288,27 +288,35 @@ void GestureRecognizerImpl::DispatchGestureEvent(GestureEvent* 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(