Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2203)

Unified Diff: Source/platform/scroll/ScrollableArea.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
Index: Source/platform/scroll/ScrollableArea.cpp
diff --git a/Source/platform/scroll/ScrollableArea.cpp b/Source/platform/scroll/ScrollableArea.cpp
index f1704953f0a5b59e98c1fe0d1817a5658c6be6a6..aa26eabee126de3dd5f6b853c1bda4f6be4417d7 100644
--- a/Source/platform/scroll/ScrollableArea.cpp
+++ b/Source/platform/scroll/ScrollableArea.cpp
@@ -239,8 +239,8 @@ bool ScrollableArea::scrollBehaviorFromString(const String& behaviorString, Scro
bool ScrollableArea::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
{
- // ctrl+wheel events are used to trigger zooming, not scrolling.
- if (wheelEvent.modifiers() & PlatformEvent::CtrlKey)
+ // Wheel events which do not scroll are used to trigger zooming.
+ if (wheelEvent.canScroll())
return false;
cancelProgrammaticScrollAnimation();
« LayoutTests/fast/events/wheelevent-ctrl.html ('K') | « Source/core/page/EventHandler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698