| Index: Source/core/dom/Node.cpp
|
| diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
|
| index e9a4172aa4ef341cb4df6eb9872289db5383a129..a6894dd0745a36bd3982c0153961b7ff7ba27ed7 100644
|
| --- a/Source/core/dom/Node.cpp
|
| +++ b/Source/core/dom/Node.cpp
|
| @@ -55,7 +55,6 @@
|
| #include "core/dom/TreeScopeAdopter.h"
|
| #include "core/dom/UserActionElementSet.h"
|
| #include "core/dom/WeakNodeMap.h"
|
| -#include "core/dom/WheelController.h"
|
| #include "core/dom/shadow/ElementShadow.h"
|
| #include "core/dom/shadow/InsertionPoint.h"
|
| #include "core/dom/shadow/ShadowRoot.h"
|
| @@ -1929,19 +1928,6 @@ void Node::didMoveToNewDocument(Document& oldDocument)
|
|
|
| oldDocument.markers().removeMarkers(this);
|
|
|
| - const EventListenerVector& mousewheelListeners = getEventListeners(EventTypeNames::mousewheel);
|
| - WheelController* oldController = WheelController::from(oldDocument);
|
| - WheelController* newController = WheelController::from(document());
|
| - for (size_t i = 0; i < mousewheelListeners.size(); ++i) {
|
| - oldController->didRemoveWheelEventHandler(oldDocument);
|
| - newController->didAddWheelEventHandler(document());
|
| - }
|
| -
|
| - const EventListenerVector& wheelListeners = getEventListeners(EventTypeNames::wheel);
|
| - for (size_t i = 0; i < wheelListeners.size(); ++i) {
|
| - oldController->didRemoveWheelEventHandler(oldDocument);
|
| - newController->didAddWheelEventHandler(document());
|
| - }
|
|
|
| if (const TouchEventTargetSet* touchHandlers = oldDocument.touchEventTargets()) {
|
| while (touchHandlers->contains(this)) {
|
| @@ -1976,9 +1962,7 @@ static inline bool tryAddEventListener(Node* targetNode, const AtomicString& eve
|
|
|
| Document& document = targetNode->document();
|
| document.addListenerTypeIfNeeded(eventType);
|
| - if (eventType == EventTypeNames::wheel || eventType == EventTypeNames::mousewheel)
|
| - WheelController::from(document)->didAddWheelEventHandler(document);
|
| - else if (isTouchEventType(eventType))
|
| + if (isTouchEventType(eventType))
|
| document.didAddTouchEventHandler(targetNode);
|
| if (document.frameHost())
|
| document.frameHost()->eventHandlerRegistry().didAddEventHandler(*targetNode, eventType);
|
| @@ -1999,9 +1983,7 @@ static inline bool tryRemoveEventListener(Node* targetNode, const AtomicString&
|
| // FIXME: Notify Document that the listener has vanished. We need to keep track of a number of
|
| // listeners for each type, not just a bool - see https://bugs.webkit.org/show_bug.cgi?id=33861
|
| Document& document = targetNode->document();
|
| - if (eventType == EventTypeNames::wheel || eventType == EventTypeNames::mousewheel)
|
| - WheelController::from(document)->didRemoveWheelEventHandler(document);
|
| - else if (isTouchEventType(eventType))
|
| + if (isTouchEventType(eventType))
|
| document.didRemoveTouchEventHandler(targetNode);
|
| if (document.frameHost())
|
| document.frameHost()->eventHandlerRegistry().didRemoveEventHandler(*targetNode, eventType);
|
|
|