Revert 177812 "Migrate touch events to EventHandlerRegistry"

trunk/Source/core/dom/Node.cpp

Index: trunk/Source/core/dom/Node.cpp
===================================================================
--- trunk/Source/core/dom/Node.cpp	(revision 177995)
+++ trunk/Source/core/dom/Node.cpp	(working copy)
@@ -329,6 +329,7 @@
 
     if (hasEventTargetData()) {
         clearEventTargetData();
+        document.didClearTouchEventHandlers(this);
         if (document.frameHost())
             document.frameHost()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     }
@@ -1942,13 +1943,20 @@
 
     oldDocument.markers().removeMarkers(this);
     oldDocument.updateRangesAfterNodeMovedToAnotherDocument(*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 (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 (WillBeHeapVector<OwnPtrWillBeMember<MutationObserverRegistration> >* registry = mutationObserverRegistry()) {
         for (size_t i = 0; i < registry->size(); ++i) {
             document().addMutationObserverTypes(registry->at(i)->mutationTypes());
@@ -1969,6 +1977,8 @@
 
     Document& document = targetNode->document();
     document.addListenerTypeIfNeeded(eventType);
+    if (isTouchEventType(eventType))
+        document.didAddTouchEventHandler(targetNode);
     if (document.frameHost())
         document.frameHost()->eventHandlerRegistry().didAddEventHandler(*targetNode, eventType);
 
@@ -1988,6 +1998,8 @@
     // 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);
 
@@ -2004,6 +2016,7 @@
     if (hasEventListeners() && document().frameHost())
         document().frameHost()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     EventTarget::removeAllEventListeners();
+    document().didClearTouchEventHandlers(this);
 }
 
 void Node::removeAllEventListenersRecursively()