Route touch-events for WebViewGuest directly to guest renderer.

content/browser/frame_host/render_widget_host_view_guest.cc

Index: content/browser/frame_host/render_widget_host_view_guest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc
index b389e405188b563fa9b973b5394576520504a8dc..47ac8db8f09026d2783dc0523548c979fa09b456 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc
@@ -14,6 +14,8 @@
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/renderer_host/render_widget_host_delegate.h"
+#include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/gpu/gpu_messages.h"
@@ -56,16 +58,9 @@ RenderWidgetHostViewGuest::RenderWidgetHostViewGuest(
       // |guest| is NULL during test.
       guest_(guest ? guest->AsWeakPtr() : base::WeakPtr<BrowserPluginGuest>()),
       platform_view_(platform_view) {
-#if defined(USE_AURA)
-  gesture_recognizer_.reset(ui::GestureRecognizer::Create());
-  gesture_recognizer_->AddGestureEventHelper(this);
-#endif  // defined(USE_AURA)
 }
 
 RenderWidgetHostViewGuest::~RenderWidgetHostViewGuest() {
-#if defined(USE_AURA)
-  gesture_recognizer_->RemoveGestureEventHelper(this);
-#endif  // defined(USE_AURA)
 }
 
 bool RenderWidgetHostViewGuest::OnMessageReceivedFromEmbedder(
@@ -133,30 +128,28 @@ bool RenderWidgetHostViewGuest::HasFocus() const {
 #if defined(USE_AURA)
 void RenderWidgetHostViewGuest::ProcessAckedTouchEvent(
     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
-  // TODO(fsamuel): Currently we will only take this codepath if the guest has
-  // requested touch events. A better solution is to always forward touchpresses
-  // to the embedder process to target a BrowserPlugin, and then route all
-  // subsequent touch points of that touchdown to the appropriate guest until
-  // 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)  {
-    if (!gesture_recognizer_->ProcessTouchEventPreDispatch(*iter, this))
-      continue;
-
-    scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-    gestures.reset(gesture_recognizer_->AckTouchEvent(
-        (*iter)->unique_event_id(), result, this));
-    ProcessGestures(gestures.get());
+  TouchEventWithLatencyInfo touch_in_guest_coords(touch.event,
+                                                     touch.latency);

[tdresser, 2015/11/02 15:38:24]

Indentation.

[wjmaclean, 2015/11/02 19:23:10]

Done.

+  // Convert coordinates to something suitable for the embedder.

[tdresser, 2015/11/02 15:38:24]

Do we ever actually use these co-ordinates? I seem to remember that I was to
switch from passing a touch event to just passing the type and unique event id.

It might be worth making that change - or at least double checking that this
logic is necessary.

[wjmaclean, 2015/11/02 19:23:10]

Hmmm, it looks like we're *not* using the coords, just the IDs. I think we used
to use the coords, but that was when they went to the local GR, and it would
have been expecting everything in coords local to the guest. I'll remove this.

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

Can you file a bug to stop passing the full event here, and reference it in a
comment?

Feel free to assign it to me.

+  for (unsigned i = 0; i < touch_in_guest_coords.event.touchesLength; ++i) {
+    blink::WebTouchPoint& touch_point = touch_in_guest_coords.event.touches[i];
+    gfx::PointF guest_point(touch_point.position.x, touch_point.position.y);
+    gfx::PointF converted_point = guest_->GetScreenCoordinates(guest_point);
+    touch_point.position.x = converted_point.x();
+    touch_point.position.y = converted_point.y();
   }
+
+  GetOwnerRenderWidgetHostView()->ProcessAckedTouchEvent(touch_in_guest_coords,
+                                                         ack_result);
 }
 #endif
 
+void RenderWidgetHostViewGuest::ProcessTouchEvent(
+    const blink::WebTouchEvent& event,
+    const ui::LatencyInfo& latency) {

[tdresser, 2015/11/02 15:38:24]

Maybe 
GetOwnerRenderWidgetHostView()->ProcessTouchEvent(...)
for symmetry with the above?

[wjmaclean, 2015/11/02 19:23:10]

This is more analogous to RenderWidgetHostViewChildFrame::ProcessMouseEvent() I
think. In the code above, the events are flowing up (being acked), not down as
they are here.

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

SGTM.

+  host_->ForwardTouchEventWithLatencyInfo(event, latency);
+}
+
 gfx::Rect RenderWidgetHostViewGuest::GetViewBounds() const {
   if (!guest_)
     return gfx::Rect();
@@ -224,6 +217,14 @@ void RenderWidgetHostViewGuest::OnSwapCompositorFrame(
     return;
   }
 
+  if (!has_started_rendering_) {
+    if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
+      host_->delegate()->GetInputEventRouter()->AddSurfaceIdNamespaceOwner(
+          GetSurfaceIdNamespace(), this);
+    }
+    has_started_rendering_ = true;
+  }
+
   cc::RenderPass* root_pass =
       frame->delegated_frame_data->render_pass_list.back();