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

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 5 years, 11 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 | « Source/core/page/EventHandler.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/ScrollableArea.cpp
diff --git a/Source/platform/scroll/ScrollableArea.cpp b/Source/platform/scroll/ScrollableArea.cpp
index 367f42821331120cd81245fa9289770ebf7286a2..c747d10b86fd3e6d0e2a69fdc310103630f8eedf 100644
--- a/Source/platform/scroll/ScrollableArea.cpp
+++ b/Source/platform/scroll/ScrollableArea.cpp
@@ -240,8 +240,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();
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698