Source/core/page/EventHandler.cpp - Issue 768443002: Honor the wheel event canScroll bit instead of trying to infer it from the ctrl modifier

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: Source/core/page/EventHandler.cpp

Issue 768443002: Honor the wheel event canScroll bit instead of trying to infer it from the ctrl modifier (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 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

« LayoutTests/fast/events/wheelevent-ctrl.html ('K') | « LayoutTests/fast/events/wheelevent-ctrl-expected.txt ('k') | Source/platform/scroll/ScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/EventHandler.cpp

diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp

index 6a38d592d4f6f3e0f6b880098b3d28ac8645f52c..8678dc4029d6d8ba02d122715c32739f56908f5c 100644

--- a/Source/core/page/EventHandler.cpp

+++ b/Source/core/page/EventHandler.cpp

@@ -2027,8 +2027,8 @@ void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEv

if (!startNode || !wheelEvent)

return;

- // Ctrl + scrollwheel is reserved for triggering zoom in/out actions in Chromium.

- if (wheelEvent->ctrlKey())

+ // When the wheelEvent do not scroll, we trigger zoom in/out instead.

+ if (!wheelEvent->canScroll())

return;

Node* stopNode = m_previousWheelScrolledNode.get();