Eager Gesture Recognition on Aura

content/browser/frame_host/render_widget_host_view_guest.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 "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/host_shared_bitmap_manager.h"
 #include "content/common/input/web_touch_event_traits.h"
 #include "content/common/view_messages.h"
 #include "content/common/webplugin_geometry.h"
 #include "content/public/common/content_switches.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
+#include "ui/events/gestures/unified_gesture_detector_enabled.h"
 
 #if defined(OS_MACOSX)
 #import "content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h"
 #endif
 
 #if defined(USE_AURA)
 #include "content/browser/renderer_host/ui_events_helper.h"
 #endif
 
 namespace content {
@@ skipping 71 matching lines @@
   // that touch point is released.
   ScopedVector<ui::TouchEvent> events;
   if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, LOCAL_COORDINATES))
     return;
 
   ui::EventResult result = (ack_result ==
       INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED;
   for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(),
       end = events.end(); iter != end; ++iter)  {
     scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-    gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture(
-        *(*iter), result, this));
+    if (ui::IsUnifiedGestureDetectorEnabled()) {
+      if (!ui::GestureRecognizer::Get()->ProcessTouchEventForGesture(*(*iter),
+                                                                     this)) {
+        gestures.reset(ui::GestureRecognizer::Get()->AckTouchEventForGesture(
+            result, this));
+      }
+    } else {

[jdduke (slow), 2014/07/30 15:29:32]

This branching is unfortunate but I guess it won't be around much longer?

[tdresser, 2014/07/31 15:33:31]

Assuming we can land eager GR in 38, I'm hoping to clean this up soon after the
M38 branch.

+      gestures.reset(
+          gesture_recognizer_->ProcessTouchEventForGestureForOldAuraGR(
+              *(*iter), result, this));
+    }
     ProcessGestures(gestures.get());
   }
 }
 #endif
 
 gfx::Rect RenderWidgetHostViewGuest::GetViewBounds() const {
   if (!guest_)
     return gfx::Rect();
 
   RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView();
@@ skipping 423 matching lines @@
   return kN32_SkColorType;
 }
 
 RenderWidgetHostViewBase*
 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const {
   return static_cast<RenderWidgetHostViewBase*>(
       guest_->GetEmbedderRenderWidgetHostView());
 }
 
 }  // namespace content