Add EventHandlerRegistry

Source/core/dom/Node.cpp

Index: Source/core/dom/Node.cpp
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index 59a60dc30368c59a007a4977c004225c0132f7e4..307c0bbb3616bc04a24418a58f164475f0154300 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -42,6 +42,7 @@
 #include "core/dom/Element.h"
 #include "core/dom/ElementRareData.h"
 #include "core/dom/ElementTraversal.h"
+#include "core/dom/EventHandlerRegistry.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/LiveNodeList.h"
 #include "core/dom/NodeRareData.h"
@@ -54,7 +55,6 @@
 #include "core/dom/Text.h"
 #include "core/dom/TreeScopeAdopter.h"
 #include "core/dom/UserActionElementSet.h"
-#include "core/dom/WheelController.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
@@ -289,6 +289,7 @@ void Node::willBeDeletedFromDocument()
 
     if (hasEventTargetData()) {
         clearEventTargetData();
+        EventHandlerRegistry::didRemoveAllEventHandlers(*this);
         document.didClearTouchEventHandlers(this);
     }
 
@@ -1918,19 +1919,7 @@ void Node::didMoveToNewDocument(Document& oldDocument)
             cache->remove(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());
-    }
+    EventHandlerRegistry::didMoveNodeToNewDocument(*this, oldDocument);
 
     if (const TouchEventTargetSet* touchHandlers = oldDocument.touchEventTargets()) {
         while (touchHandlers->contains(this)) {
@@ -1959,9 +1948,8 @@ 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))
+    EventHandlerRegistry::from(document)->didAddEventHandler(document, eventType, targetNode);
+    if (isTouchEventType(eventType))
         document.didAddTouchEventHandler(targetNode);
 
     return true;
@@ -1980,9 +1968,8 @@ 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))
+    EventHandlerRegistry::from(document)->didRemoveEventHandler(document, eventType, targetNode);
+    if (isTouchEventType(eventType))
         document.didRemoveTouchEventHandler(targetNode);
 
     return true;
@@ -1995,6 +1982,7 @@ bool Node::removeEventListener(const AtomicString& eventType, EventListener* lis
 
 void Node::removeAllEventListeners()
 {
+    EventHandlerRegistry::didRemoveAllEventHandlers(*this);
     EventTarget::removeAllEventListeners();
     document().didClearTouchEventHandlers(this);
 }