Index: content/browser/renderer_host/input/mouse_wheel_event_queue.cc |
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc |
index 89a9f5a4e7f5d6058e2f753a26573d903d3f2222..972f82110d73a015ce39dc197f40188cbcc25802 100644 |
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc |
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc |
@@ -33,10 +33,12 @@ |
}; |
MouseWheelEventQueue::MouseWheelEventQueue(MouseWheelEventQueueClient* client, |
+ bool send_gestures, |
int64_t scroll_transaction_ms) |
: client_(client), |
needs_scroll_begin_(true), |
needs_scroll_end_(false), |
+ send_gestures_(send_gestures), |
scroll_transaction_ms_(scroll_transaction_ms), |
scrolling_device_(blink::WebGestureDeviceUninitialized) { |
DCHECK(client); |
@@ -79,7 +81,7 @@ |
client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result); |
// If event wasn't consumed then generate a gesture scroll for it. |
- if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && |
+ if (send_gestures_ && ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && |
event_sent_for_gesture_ack_->event.canScroll && |
event_sent_for_gesture_ack_->event.resendingPluginId == -1 && |
(scrolling_device_ == blink::WebGestureDeviceUninitialized || |