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

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, 1 month 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/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 6a38d592d4f6f3e0f6b880098b3d28ac8645f52c..723714824a0f1ceeebce111a012a5f86bb4d0c2b 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())
+ // Method suppressScroll() is reserved for triggering zoom in/out actions in Chromium.
tdresser 2014/11/27 15:06:09 Method suppressScroll() -> When scrolling is suppr
lanwei 2014/12/02 15:48:10 Done.
+ if (wheelEvent->suppressScroll())
return;
Node* stopNode = m_previousWheelScrolledNode.get();

Powered by Google App Engine
This is Rietveld 408576698