Route touch-events for WebViewGuest directly to guest renderer.

content/browser/renderer_host/render_widget_host_input_event_router.cc

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 namespace content {
 
-RenderWidgetHostInputEventRouter::RenderWidgetHostInputEventRouter() {}
+RenderWidgetHostInputEventRouter::RenderWidgetHostInputEventRouter()
+    : current_touch_target_(nullptr), active_touches_(0) {}
 
 RenderWidgetHostInputEventRouter::~RenderWidgetHostInputEventRouter() {
   owner_map_.clear();
 }
 
 RenderWidgetHostViewBase* RenderWidgetHostInputEventRouter::FindEventTarget(
     RenderWidgetHostViewBase* root_view,
     const gfx::Point& point,
     gfx::Point* transformed_point) {
   // Short circuit if owner_map has only one RenderWidgetHostView, no need for
@@ skipping 36 matching lines @@
     blink::WebMouseWheelEvent* event) {
   gfx::Point transformed_point;
   RenderWidgetHostViewBase* target = FindEventTarget(
       root_view, gfx::Point(event->x, event->y), &transformed_point);
   event->x = transformed_point.x();
   event->y = transformed_point.y();
 
   target->ProcessMouseWheelEvent(*event);
 }
 
+void RenderWidgetHostInputEventRouter::RouteTouchEvent(
+    RenderWidgetHostViewBase* root_view,
+    blink::WebTouchEvent* event,
+    const ui::LatencyInfo& latency) {
+  switch (event->type) {
+    case blink::WebInputEvent::TouchStart: {
+      if (!active_touches_) {
+        // Since this is the first touch, it defines the target for the rest
+        // of this sequence.
+        DCHECK(!current_touch_target_);
+        gfx::Point transformed_point;
+        gfx::Point original_point(event->touches[0].position.x,
+                                  event->touches[0].position.y);
+        current_touch_target_ =
+            FindEventTarget(root_view, original_point, &transformed_point);
+      }
+      ++active_touches_;
+      current_touch_target_->ProcessTouchEvent(*event, latency);
+      break;
+    }
+    case blink::WebInputEvent::TouchMove:
+      DCHECK(current_touch_target_);
+      current_touch_target_->ProcessTouchEvent(*event, latency);
+      break;
+    case blink::WebInputEvent::TouchEnd:
+    case blink::WebInputEvent::TouchCancel:

[tdresser, 2015/11/02 21:10:19]

Check for target here too.

[wjmaclean, 2015/11/03 14:54:25]

Done.

+      DCHECK(active_touches_);
+      current_touch_target_->ProcessTouchEvent(*event, latency);
+      --active_touches_;
+      if (!active_touches_) {
+        DCHECK(current_touch_target_);
+        current_touch_target_ = nullptr;
+      }
+      break;
+    default:
+      NOTREACHED();
+  }
+}
+
 void RenderWidgetHostInputEventRouter::AddSurfaceIdNamespaceOwner(
     uint32_t id,
     RenderWidgetHostViewBase* owner) {
   DCHECK(owner_map_.find(id) == owner_map_.end());
   owner_map_.insert(std::make_pair(id, owner));
 }
 
 void RenderWidgetHostInputEventRouter::RemoveSurfaceIdNamespaceOwner(
     uint32_t id) {
   owner_map_.erase(id);
 }
 
 }  // namespace content