Migrate touch events to 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 0d4d733cf5fdfc8af8fa1855509cb4f0a30e8671..175076f7312db0d40459dcf3a490baf60c4b18f7 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -320,7 +320,6 @@ void Node::willBeDeletedFromDocument()
 
     if (hasEventTargetData()) {
         clearEventTargetData();
-        document.didClearTouchEventHandlers(this);
         if (document.frameHost())
             document.frameHost()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     }
@@ -1940,19 +1939,12 @@ void Node::didMoveToNewDocument(Document& oldDocument)
 
     oldDocument.markers().removeMarkers(this);
     oldDocument.updateRangesAfterNodeMovedToAnotherDocument(*this);
-
-    if (const TouchEventTargetSet* touchHandlers = oldDocument.touchEventTargets()) {
-        while (touchHandlers->contains(this)) {
-            oldDocument.didRemoveTouchEventHandler(this);
-            document().didAddTouchEventHandler(this);
-        }
-    }
-    if (oldDocument.frameHost() != document().frameHost()) {
-        if (oldDocument.frameHost())
-            oldDocument.frameHost()->eventHandlerRegistry().didMoveOutOfFrameHost(*this);
-        if (document().frameHost())
-            document().frameHost()->eventHandlerRegistry().didMoveIntoFrameHost(*this);
-    }
+    if (oldDocument.frameHost() && !document().frameHost())
+        oldDocument.frameHost()->eventHandlerRegistry().didMoveOutOfFrameHost(*this);
+    else if (document().frameHost() && !oldDocument.frameHost())
+        document().frameHost()->eventHandlerRegistry().didMoveIntoFrameHost(*this);
+    else if (oldDocument.frameHost() != document().frameHost())
+        EventHandlerRegistry::didMoveBetweenFrameHosts(*this, oldDocument.frameHost(), document().frameHost());
 
     if (WillBeHeapVector<OwnPtrWillBeMember<MutationObserverRegistration> >* registry = mutationObserverRegistry()) {
         for (size_t i = 0; i < registry->size(); ++i) {
@@ -1974,8 +1966,6 @@ static inline bool tryAddEventListener(Node* targetNode, const AtomicString& eve
 
     Document& document = targetNode->document();
     document.addListenerTypeIfNeeded(eventType);
-    if (isTouchEventType(eventType))
-        document.didAddTouchEventHandler(targetNode);
     if (document.frameHost())
         document.frameHost()->eventHandlerRegistry().didAddEventHandler(*targetNode, eventType);
 
@@ -1995,8 +1985,6 @@ 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 (isTouchEventType(eventType))
-        document.didRemoveTouchEventHandler(targetNode);
     if (document.frameHost())
         document.frameHost()->eventHandlerRegistry().didRemoveEventHandler(*targetNode, eventType);
 
@@ -2013,7 +2001,6 @@ void Node::removeAllEventListeners()
     if (hasEventListeners() && document().frameHost())
         document().frameHost()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     EventTarget::removeAllEventListeners();
-    document().didClearTouchEventHandlers(this);
 }
 
 void Node::removeAllEventListenersRecursively()