Route touch-events for WebViewGuest directly to guest renderer.

content/browser/frame_host/render_widget_host_view_child_frame.cc

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 1324f77e15c2eef56d5b3e58849ed79b69f6f723..31681fa9c3243014ae7efcf0c4189f5c998a3723 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -33,16 +33,12 @@ RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(
       next_surface_sequence_(1u),
       last_output_surface_id_(0),
       current_surface_scale_factor_(1.f),
+      has_started_rendering_(false),
       ack_pending_count_(0),
       frame_connector_(nullptr),
       weak_factory_(this) {
-  if (use_surfaces_) {
+  if (use_surfaces_)
     id_allocator_ = CreateSurfaceIdAllocator();
-    if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
-      host_->delegate()->GetInputEventRouter()->AddSurfaceIdNamespaceOwner(
-          GetSurfaceIdNamespace(), this);
-    }
-  }
 
   host_->SetView(this);
 }
@@ -267,6 +263,20 @@ void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame(
     return;
   }
 
+  if (!has_started_rendering_) {
+    // We need to postpone registering the SurfaceIdNamespaceOwner until we
+    // start rendering, otherwise WebViewGuests, which use
+    // RenderWidgetHostViewGuest (derived from this class) will register
+    // before being properly attached to their outer WebContents, meaning
+    // they won't be registered with the correct
+    // RenderWidgetHostInputEventRouter.
+    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();