Index: Source/platform/scroll/ScrollAnimator.cpp |
diff --git a/Source/platform/scroll/ScrollAnimator.cpp b/Source/platform/scroll/ScrollAnimator.cpp |
index 412c592362a9d5b9f78c62ab4c674b1767f7d1fa..c7d98d7711b8c26a8a95c8f1f04e7d7441731cc4 100644 |
--- a/Source/platform/scroll/ScrollAnimator.cpp |
+++ b/Source/platform/scroll/ScrollAnimator.cpp |
@@ -76,6 +76,10 @@ void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset) |
bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e) |
{ |
+ // ctrl+wheel events are used to trigger zooming, not scrolling. |
rjkroege
2014/03/26 20:03:25
i am not convinced that this is the right place to
|
+ if (e.modifiers() & PlatformEvent::CtrlKey) |
+ return false; |
+ |
bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar); |
bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar); |