Route touch-events for WebViewGuest directly to guest renderer.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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_view_aura.h"
 
 #include <set>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.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_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/site_isolation_policy.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
@@ skipping 797 matching lines @@
                                   ui::EF_RIGHT_MOUSE_BUTTON;
       return (event->flags() & kAllowedButtons) != 0;
     }
     default:
       break;
   }
 #endif
   return true;
 }
 
+bool RenderWidgetHostViewAura::ShouldRouteEvent(const ui::Event* event) const {
+  bool result = host_->delegate() && host_->delegate()->GetInputEventRouter();
+  if (event->IsMouseEvent())

[Charlie Reis, 2015/11/30 18:09:11]

Please add a comment in this method about what policy you're trying to achieve. 
It's hard to understand what this means as is-- are we just in an intermediate
state where we use the input event router for touch but not mouse events?

Also, is this mean to affect non-BrowserPlugin code?  It looks like it affects
all views in default Chrome.

[wjmaclean, 2015/12/10 16:09:07]

Done.
It doesn't really affect all views, as in the CL only RenderWidgetHostViewAura
calls RenderWidgetHostViewBase::ProcessTouchEvent(). This means that
RenderWidgetHostView{Mac|Android} each continue to do their own thing.

At present touch forwarding is not supported in OOPIF, so this code doesn't
break anything, though it does provide a way forward in a subsequent CL.

[Charlie Reis, 2015/12/10 21:58:14]

I think you misunderstood my question.  By default Chrome, I meant platforms
that use RenderWidgetHostViewAura (i.e., Windows, Linux, and ChromeOS).  I'm
concerned that this affects behavior for Windows/Linux/ChromeOS, even for users
who don't have --site-per-process or BrowserPlugins.  It's not clear to me
whether that was intentional.

+    result = result && SiteIsolationPolicy::AreCrossProcessFramesPossible();
+  return result;
+}
+
 void RenderWidgetHostViewAura::HandleParentBoundsChanged() {
   SnapToPhysicalPixelBoundary();
 #if defined(OS_WIN)
   if (legacy_render_widget_host_HWND_) {
     legacy_render_widget_host_HWND_->SetBounds(
         window_->GetBoundsInRootWindow());
   }
 #endif
   if (!in_shutdown_)
     host_->SendScreenRects();
@@ skipping 1250 matching lines @@
                         reinterpret_cast<LPARAM>(toplevel_hwnd));
     }
 #endif
     // The Disambiguation popup does not parent itself from this window, so we
     // manually dismiss it.
     HideDisambiguationPopup();
 
     blink::WebMouseWheelEvent mouse_wheel_event =
         MakeWebMouseWheelEvent(static_cast<ui::MouseWheelEvent&>(*event));
     if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0) {
-      if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
+      if (ShouldRouteEvent(event)) {
         host_->delegate()->GetInputEventRouter()->RouteMouseWheelEvent(
             this, &mouse_wheel_event);
       } else {
         ProcessMouseWheelEvent(mouse_wheel_event);
       }
     }
   } else {
     bool is_selection_popup =
         popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab();
     if (CanRendererHandleEvent(event, mouse_locked_, is_selection_popup) &&
         !(event->flags() & ui::EF_FROM_TOUCH)) {
       // Confirm existing composition text on mouse press, to make sure
       // the input caret won't be moved with an ongoing composition text.
       if (event->type() == ui::ET_MOUSE_PRESSED)
         FinishImeCompositionSession();
 
       blink::WebMouseEvent mouse_event = MakeWebMouseEvent(*event);
       ModifyEventMovementAndCoords(&mouse_event);
-      if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
+      if (ShouldRouteEvent(event)) {
         host_->delegate()->GetInputEventRouter()->RouteMouseEvent(this,
                                                                   &mouse_event);
       } else {
         ProcessMouseEvent(mouse_event);
       }
 
       // Ensure that we get keyboard focus on mouse down as a plugin window may
       // have grabbed keyboard focus.
       if (event->type() == ui::ET_MOUSE_PRESSED)
         SetKeyboardFocus();
@@ skipping 52 matching lines @@
 void RenderWidgetHostViewAura::ProcessMouseEvent(
     const blink::WebMouseEvent& event) {
   host_->ForwardMouseEvent(event);
 }
 
 void RenderWidgetHostViewAura::ProcessMouseWheelEvent(
     const blink::WebMouseWheelEvent& event) {
   host_->ForwardWheelEvent(event);
 }
 
+void RenderWidgetHostViewAura::ProcessTouchEvent(
+    const blink::WebTouchEvent& event,
+    const ui::LatencyInfo& latency) {
+  host_->ForwardTouchEventWithLatencyInfo(event, latency);
+}
+
 void RenderWidgetHostViewAura::TransformPointToLocalCoordSpace(
     const gfx::Point& point,
     cc::SurfaceId original_surface,
     gfx::Point* transformed_point) {
   delegated_frame_host_->TransformPointToLocalCoordSpace(
       point, original_surface, transformed_point);
 }
 
 void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) {
   TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnScrollEvent");
@@ skipping 54 matching lines @@
 
   // It is important to always mark events as being handled asynchronously when
   // they are forwarded. This ensures that the current event does not get
   // processed by the gesture recognizer before events currently awaiting
   // dispatch in the touch queue.
   event->DisableSynchronousHandling();
 
   // Set unchanged touch point to StateStationary for touchmove and
   // touchcancel to make sure only send one ack per WebTouchEvent.
   MarkUnchangedTouchPointsAsStationary(&touch_event, event->touch_id());
-  host_->ForwardTouchEventWithLatencyInfo(touch_event, *event->latency());
+  if (ShouldRouteEvent(event)) {
+    host_->delegate()->GetInputEventRouter()->RouteTouchEvent(
+        this, &touch_event, *event->latency());
+  } else {
+    ProcessTouchEvent(touch_event, *event->latency());
+  }
 }
 
 void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) {
   TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnGestureEvent");
 
   if ((event->type() == ui::ET_GESTURE_PINCH_BEGIN ||
       event->type() == ui::ET_GESTURE_PINCH_UPDATE ||
       event->type() == ui::ET_GESTURE_PINCH_END) && !pinch_zoom_enabled_) {
     event->SetHandled();
     return;
@@ skipping 667 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content