Prevent ctrl+wheel from scrolling in more places

Source/platform/scroll/ScrollAnimator.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 58 matching lines @@
 void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 {
     FloatSize delta = FloatSize(offset.x() - m_currentPosX, offset.y() - m_currentPosY);
     m_currentPosX = offset.x();
     m_currentPosY = offset.y();
     notifyPositionChanged(delta);
 }
 
 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 do this. Why can't the
decision happen in EventHandler?

ScrollAnimator is (at least in my opinion) only about scrolling.

+    if (e.modifiers() & PlatformEvent::CtrlKey)
+        return false;
+
     bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar);
     bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar);
 
     // Accept the event if we are scrollable in that direction and can still
     // scroll any further.
     float deltaX = canScrollX ? e.deltaX() : 0;
     float deltaY = canScrollY ? e.deltaY() : 0;
 
     bool handled = false;
 
@@ skipping 53 matching lines @@
 }
 
 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, float pos)
 {
     float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);
     float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);
     return std::max(std::min(pos, maxScrollPos), minScrollPos);
 }
 
 } // namespace WebCore