Eager Gesture Recognition on Aura

ui/aura/window_event_dispatcher.cc

 // Copyright 2014 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/aura/window_event_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 142 matching lines @@
 DispatchDetails WindowEventDispatcher::DispatchMouseExitAtPoint(
     const gfx::Point& point) {
   ui::MouseEvent event(ui::ET_MOUSE_EXITED, point, point, ui::EF_NONE,
                        ui::EF_NONE);
   return DispatchMouseEnterOrExit(event, ui::ET_MOUSE_EXITED);
 }
 
 void WindowEventDispatcher::ProcessedTouchEvent(ui::TouchEvent* event,
                                                 Window* window,
                                                 ui::EventResult result) {
-  scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-  gestures.reset(ui::GestureRecognizer::Get()->
-      ProcessTouchEventForGesture(*event, result, window));
+  ui::TouchEvent orig_event(*static_cast<const ui::TouchEvent*>(event),
+                            static_cast<Window*>(window),
+                            this->window());
+  // Once we've fully migrated to the unified gesture detector, we won't need to

[sadrul, 2014/08/01 21:00:06]

Do you mean 'eager' instead of 'unified'?

[tdresser, 2014/08/05 14:40:14]

Done.

+  // pass an event here.
+  scoped_ptr<ui::GestureRecognizer::Gestures> gestures(
+      ui::GestureRecognizer::Get()->ProcessTouchEventOnAsyncAck(
+          orig_event, result, window));
   DispatchDetails details = ProcessGestures(gestures.get());
   if (details.dispatcher_destroyed)
     return;
 }
 
 void WindowEventDispatcher::HoldPointerMoves() {
   if (!move_hold_count_)
     held_event_factory_.InvalidateWeakPtrs();
   ++move_hold_count_;
   TRACE_EVENT_ASYNC_BEGIN0("ui", "WindowEventDispatcher::HoldPointerMoves",
@@ skipping 302 matching lines @@
   old_dispatch_target_ = NULL;
 #ifndef NDEBUG
   DCHECK(!event_dispatch_target_ || window()->Contains(event_dispatch_target_));
 #endif
 
   if (event.IsTouchEvent() && !details.target_destroyed) {
     // Do not let 'held' touch events contribute to any gestures unless it is
     // being dispatched.
     if (dispatching_held_event_ || !held_move_event_ ||
         !held_move_event_->IsTouchEvent()) {
+      // If the event is being handled asynchronously, ignore it.
+      if(event.result() & ui::ER_CONSUMED)
+        return details;
+      scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
+
+      // Once we've fully migrated to the unified gesture detector, we won't

[sadrul, 2014/08/01 21:00:06]

ditto

[tdresser, 2014/08/05 14:40:14]

Done.

+      // need to pass an event here.
       ui::TouchEvent orig_event(static_cast<const ui::TouchEvent&>(event),
-                                static_cast<Window*>(event.target()), window());
-      // Get the list of GestureEvents from GestureRecognizer.
-      scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-      gestures.reset(ui::GestureRecognizer::Get()->
-          ProcessTouchEventForGesture(orig_event, event.result(),
-                                      static_cast<Window*>(target)));
+                                static_cast<Window*>(event.target()),
+                                window());
+      gestures.reset(
+          ui::GestureRecognizer::Get()->ProcessTouchEventPostDispatch(
+              orig_event, event.result(), static_cast<Window*>(target)));
+
       return ProcessGestures(gestures.get());
     }
   }
 
   return details;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowEventDispatcher, ui::GestureEventHelper implementation:
 
@@ skipping 354 matching lines @@
         held_move_event_.reset(new ui::TouchEvent(*event, target, window()));
         event->SetHandled();
         return;
       }
       break;
 
     default:
       NOTREACHED();
       break;
   }
+
+  if (dispatching_held_event_ || !held_move_event_ ||
+      !held_move_event_->IsTouchEvent()) {
+    ui::TouchEvent orig_event(
+        static_cast<const ui::TouchEvent&>(*event), target, window());
+
+    // If the touch event is invalid in some way, the gesture recognizer will
+    // reject it. In this case, stop the touch from reaching the next event
+    // phase.
+    if (!ui::GestureRecognizer::Get()->ProcessTouchEventPreDispatch(orig_event,
+                                                                    target)) {
+      event->SetHandled();
+    }
+  }
+
   PreDispatchLocatedEvent(target, event);
 }
 
 }  // namespace aura