content/browser/renderer_host/input/mouse_wheel_event_queue.cc - Issue 2050033002: Revert of Remove enable/disable wheel gestures setting.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/input/mouse_wheel_event_queue.cc

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/input/mouse_wheel_event_queue.h ('k') | content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ||