Reland: Fix touchpad gesture routing to renderers

content/browser/renderer_host/render_widget_host_input_event_router.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 78 matching lines @@
                          const gfx::Point& point_in_quad_space) override;
     bool AcceptHitTarget(const cc::SurfaceDrawQuad* surface_quad,
                          const gfx::Point& point_in_quad_space) override;
 
     const std::unordered_map<cc::SurfaceId, HittestData, cc::SurfaceIdHash>&
         hittest_data_;
   };
 
   using SurfaceIdNamespaceOwnerMap =
       base::hash_map<uint32_t, RenderWidgetHostViewBase*>;
-  struct GestureTargetData {
+  struct TouchscreenGestureTargetData {
     RenderWidgetHostViewBase* target;
     const gfx::Vector2d delta;
 
-    GestureTargetData(RenderWidgetHostViewBase* target, gfx::Vector2d delta)
+    TouchscreenGestureTargetData(RenderWidgetHostViewBase* target,
+                                 gfx::Vector2d delta)
         : target(target), delta(delta) {}
   };
-  using GestureTargetQueue = std::deque<GestureTargetData>;
+  using TouchscreenGestureTargetQueue =
+      std::deque<TouchscreenGestureTargetData>;
 
   void ClearAllObserverRegistrations();
 
   RenderWidgetHostViewBase* FindEventTarget(RenderWidgetHostViewBase* root_view,
                                             const gfx::Point& point,
                                             gfx::Point* transformed_point);
 
+  void RouteTouchscreenGestureEvent(RenderWidgetHostViewBase* root_view,
+                                    blink::WebGestureEvent* event,
+                                    const ui::LatencyInfo& latency);
+  void RouteTouchpadGestureEvent(RenderWidgetHostViewBase* root_view,
+                                 blink::WebGestureEvent* event,
+                                 const ui::LatencyInfo& latency);
+
   SurfaceIdNamespaceOwnerMap owner_map_;
-  GestureTargetQueue gesture_target_queue_;
+  TouchscreenGestureTargetQueue touchscreen_gesture_target_queue_;
   RenderWidgetHostViewBase* touch_target_;
-  RenderWidgetHostViewBase* gesture_target_;
+  RenderWidgetHostViewBase* touchscreen_gesture_target_;
+  RenderWidgetHostViewBase* touchpad_gesture_target_;
   gfx::Vector2d touch_delta_;
-  gfx::Vector2d gesture_delta_;
+  gfx::Vector2d touchscreen_gesture_delta_;
+  gfx::Vector2d touchpad_gesture_delta_;

[sadrul, 2016/06/06 15:21:47]

You probably won't have both touchpad and touchscreen gestures at the same time,
so maybe just have the old fileds, with a separate 'gesture source' field that
can be either touchscreen or touchpad?

[mohsen, 2016/06/06 18:33:41]

I don't think it is impossible to have both gesture types at the same time (e.g.
user starting a touchscreen scroll while doing a touchpad pinch zoom). In this
case should the new gesture sequence override the existing one? With my CL these
two can happen simultaneously.

   int active_touches_;
   std::unordered_map<cc::SurfaceId, HittestData, cc::SurfaceIdHash>
       hittest_data_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostInputEventRouter);
   FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
                            InputEventRouterGestureTargetQueueTest);
+  FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
+                           InputEventRouterTouchpadGestureTargetTest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_