Remove the default wheel event handler from blink.

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 90 matching lines @@
 #include "platform/scroll/Scrollbar.h"
 #include "wtf/Assertions.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
 namespace {
 
-// Convert |event->deltaMode()| to scroll granularity and output as |granularity|.
-bool wheelGranularityToScrollGranularity(const WheelEvent* event, ScrollGranularity* granularity)
-{
-    DCHECK(granularity);
-    switch (event->deltaMode()) {
-    case WheelEvent::DOM_DELTA_PAGE:
-        *granularity = ScrollByPage;
-        return true;
-    case WheelEvent::DOM_DELTA_LINE:
-        *granularity = ScrollByLine;
-        return true;
-    case WheelEvent::DOM_DELTA_PIXEL:
-        *granularity = event->hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel;
-        return true;
-    default:
-        // Could be other values since the event might come from JavaScript.
-        return false;
-    }
-}
-
 // Refetch the event target node if it is removed or currently is the shadow node inside an <input> element.
 // If a mouse event handler changes the input element type to one that has a widget associated,
 // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
 // event target node can't still be the shadow node.
 bool shouldRefetchEventTarget(const MouseEventWithHitTestResults& mev)
 {
     Node* targetNode = mev.innerNode();
     if (!targetNode || !targetNode->parentNode())
         return true;
     return targetNode->isShadowRoot() && isHTMLInputElement(toShadowRoot(targetNode)->host());
@@ skipping 1493 matching lines @@
 
     Node* node = result.innerNode();
     // Wheel events should not dispatch to text nodes.
     if (node && node->isTextNode())
         node = FlatTreeTraversal::parent(*node);
 
     // If we're over the frame scrollbar, scroll the document.
     if (!node && result.scrollbar())
         node = doc->documentElement();
 
-    bool sendDOMEvent = true;
     LocalFrame* subframe = subframeForTargetNode(node);
     if (subframe) {
         WebInputEventResult result = subframe->eventHandler().handleWheelEvent(event);
         if (result != WebInputEventResult::NotHandled) {
             m_scrollManager.setFrameWasScrolledByUser();
             return result;
         }
-        // TODO(dtapuska): Remove this once wheel gesture scroll has
-        // been enabled everywhere; as we can just return early.
-        // http://crbug.com/568183
-        // Don't propagate the DOM event into the parent iframe
-        // but do dispatch the scroll event.
-        sendDOMEvent = false;
+        return WebInputEventResult::NotHandled;

[bokan, 2016/06/08 15:26:51]

We can just `return result` here instead.

[dtapuska, 2016/06/08 15:36:04]

Done.

[dtapuska, 2016/06/08 15:36:04]

Done.

     }
 
     if (node) {
         WheelEvent* domEvent = WheelEvent::create(event, node->document().domWindow());
-        if (sendDOMEvent) {
-            DispatchEventResult domEventResult = node->dispatchEvent(domEvent);
-            if (domEventResult != DispatchEventResult::NotCanceled)
-                return toWebInputEventResult(domEventResult);
-        } else {
-            defaultWheelEventHandler(node, domEvent);
-            if (domEvent->defaultHandled())
-                return WebInputEventResult::HandledSystem;
-        }
+        DispatchEventResult domEventResult = node->dispatchEvent(domEvent);
+        if (domEventResult != DispatchEventResult::NotCanceled)
+            return toWebInputEventResult(domEventResult);
     }
 
     return WebInputEventResult::NotHandled;
 }
 
-void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEvent)
-{
-    if (!startNode || !wheelEvent)
-        return;
-
-    Settings* settings = m_frame->settings();
-    if (settings && settings->wheelGesturesEnabled())
-        return;
-
-    // When the wheelEvent do not scroll, we trigger zoom in/out instead.
-    if (!wheelEvent->canScroll())
-        return;
-
-    ScrollGranularity granularity;
-    if (!wheelGranularityToScrollGranularity(wheelEvent, &granularity))
-        return;
-    Node* node = nullptr;
-
-    // Diagonal movement on a MacBook pro is an example of a 2-dimensional
-    // mouse wheel event (where both deltaX and deltaY can be set).
-    FloatSize delta;
-
-    if (wheelEvent->getRailsMode() != Event::RailsModeVertical)
-        delta.setWidth(wheelEvent->deltaX());
-
-    if (wheelEvent->getRailsMode() != Event::RailsModeHorizontal)
-        delta.setHeight(wheelEvent->deltaY());
-
-    // We can get page wheel events with non-[0|1] deltas in the case where the
-    // events are coalesced but we still want to scroll by just one page length.
-    // TODO(bokan): This seems like it belongs in the coalescing logic.
-    if (granularity == ScrollByPage) {
-        if (delta.width())
-            delta.setWidth(delta.width() > 0 ? 1 : -1);
-        if (delta.height())
-            delta.setHeight(delta.height() > 0 ? 1 : -1);
-    }
-
-    // FIXME: enable scroll customization in this case. See crbug.com/410974.
-    bool consumed = false;
-
-    m_scrollManager.physicalScroll(
-        granularity,
-        delta,
-        FloatPoint(),
-        FloatSize(),
-        startNode,
-        &node,
-        &consumed);
-
-    if (consumed)
-        wheelEvent->setDefaultHandled();
-}
-
 WebInputEventResult EventHandler::handleGestureShowPress()
 {
     m_lastShowPressTimestamp = WTF::monotonicallyIncreasingTime();
 
     FrameView* view = m_frame->view();
     if (!view)
         return WebInputEventResult::NotHandled;
     if (ScrollAnimatorBase* scrollAnimator = view->existingScrollAnimator())
         scrollAnimator->cancelAnimation();
     const FrameView::ScrollableAreaSet* areas = view->scrollableAreas();
@@ skipping 1411 matching lines @@
 
 FrameHost* EventHandler::frameHost() const
 {
     if (!m_frame->page())
         return nullptr;
 
     return &m_frame->page()->frameHost();
 }
 
 } // namespace blink