| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index 6963b213ad3806a21bdf94826a1268a601d402f4..423d032d6d294d51b31dcf1018d2e1fa905e909e 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -2260,6 +2260,12 @@ void RenderWidgetHostViewAura::ProcessTouchEvent(
|
| host_->ForwardTouchEventWithLatencyInfo(event, latency);
|
| }
|
|
|
| +void RenderWidgetHostViewAura::ProcessGestureEvent(
|
| + const blink::WebGestureEvent& event,
|
| + const ui::LatencyInfo& latency) {
|
| + host_->ForwardGestureEventWithLatencyInfo(event, latency);
|
| +}
|
| +
|
| void RenderWidgetHostViewAura::TransformPointToLocalCoordSpace(
|
| const gfx::Point& point,
|
| cc::SurfaceId original_surface,
|
| @@ -2368,11 +2374,21 @@ void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) {
|
| blink::WebGestureEvent fling_cancel = gesture;
|
| fling_cancel.type = blink::WebInputEvent::GestureFlingCancel;
|
| fling_cancel.sourceDevice = blink::WebGestureDeviceTouchscreen;
|
| - host_->ForwardGestureEvent(fling_cancel);
|
| + if (ShouldRouteEvent(event)) {
|
| + host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
|
| + this, &fling_cancel, ui::LatencyInfo());
|
| + } else {
|
| + host_->ForwardGestureEvent(fling_cancel);
|
| + }
|
| }
|
|
|
| if (gesture.type != blink::WebInputEvent::Undefined) {
|
| - host_->ForwardGestureEventWithLatencyInfo(gesture, *event->latency());
|
| + if (ShouldRouteEvent(event)) {
|
| + host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
|
| + this, &gesture, *event->latency());
|
| + } else {
|
| + host_->ForwardGestureEventWithLatencyInfo(gesture, *event->latency());
|
| + }
|
|
|
| if (event->type() == ui::ET_GESTURE_SCROLL_BEGIN ||
|
| event->type() == ui::ET_GESTURE_SCROLL_UPDATE ||
|
|
|