content/renderer/input/input_handler_proxy.cc - Issue 739013008: Explicitly suppress scrolling for wheel events that will trigger zooming

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/renderer/input/input_handler_proxy.cc

Issue 739013008: Explicitly suppress scrolling for wheel events that will trigger zooming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Unit tests Created 6 years 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

« content/common/input/web_input_event_traits_unittest.cc ('K') | « content/common/input/web_input_event_traits_unittest.cc ('k') | content/renderer/input/input_handler_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/input/input_handler_proxy.cc

diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc

index ce178ec13ec1a6ae1f416291df6f62d0cae9dfbf..2e6b87022ba61eadc080f8d34df7f34c2022d066 100644

--- a/content/renderer/input/input_handler_proxy.cc

+++ b/content/renderer/input/input_handler_proxy.cc

@@ -324,9 +324,9 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(

// TODO(jamesr): We don't properly handle scroll by page in the compositor

// thread, so punt it to the main thread. http://crbug.com/236639

result = DID_NOT_HANDLE;

- } else if (wheel_event.modifiers & WebInputEvent::ControlKey) {

- // Wheel events involving the control key never trigger scrolling, only

- // event handlers. Forward to the main thread.

+ } else if (!wheel_event.canScroll) {

+ // Wheel events with |canScroll| == false will not trigger scrolling,

+ // only event handlers. Forward to the main thread.

result = DID_NOT_HANDLE;

} else if (smooth_scroll_enabled_) {

cc::InputHandler::ScrollStatus scroll_status =