Index: content/browser/renderer_host/input/input_router_impl.cc |
diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc |
index 105051105bb1a7f5bff2551a063bec41ba313a65..1a9e1c91d08fcbf92467e58d41b48eec508a05ce 100644 |
--- a/content/browser/renderer_host/input/input_router_impl.cc |
+++ b/content/browser/renderer_host/input/input_router_impl.cc |
@@ -242,6 +242,16 @@ void InputRouterImpl::SendGestureEvent( |
const GestureEventWithLatencyInfo& original_gesture_event) { |
event_stream_validator_.OnEvent(original_gesture_event.event); |
GestureEventWithLatencyInfo gesture_event(original_gesture_event); |
+ |
+ // Trackpad pinch gestures are not yet handled by the renderer. |
+ // TODO(rbyers): Send mousewheel for trackpad pinch - crbug.com/289887. |
+ if (gesture_event.event.sourceDevice == WebGestureEvent::Touchpad && |
jdduke (slow)
2014/03/26 23:13:43
I always hesitate to ack an event out-of-order. W
Rick Byers
2014/03/27 01:44:09
Yeah that's probably better - done.
|
+ (gesture_event.event.type == WebInputEvent::GesturePinchUpdate)) { |
+ ack_handler_->OnGestureEventAck(gesture_event, |
+ INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
+ return; |
+ } |
+ |
if (touch_action_filter_.FilterGestureEvent(&gesture_event.event)) |
return; |