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 2922e090f00ee72cfbffb0b320d7ae1b239fd22f..6aef01dc0b7f1948445580ee92fcb308e2394e0b 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,8 @@ void Node::didMoveToNewDocument(Document& oldDocument)
 
     oldDocument.markers().removeMarkers(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())

[Rick Byers, 2014/06/19 17:10:36]

Since the boundary of interest has moved from frames to FrameHosts, I guess we
should really be adding at least one basic test that hits code like this, right?
 All the redundant checks in the existing tests for the counts in different
frames have become pretty silly now (since which frame you ask about is now
irrelevant, except for the framehost it's in).

[Sami, 2014/06/27 17:58:51]

Yes, actually the previous CLs for scroll and mouse wheel handlers already added
a bunch of tests for this. I checked whether all three cases were being
exercised, and turns out we weren't checking the behavior of handlers in the
final case (just nodes in general) so I've added a test specifically for it.
Yeah, those tests are a bit unnecessary now, but I figure keeping them around is
still good insurance.

[Rick Byers, 2014/06/27 21:36:51]

SGTM, thanks.

+        EventHandlerRegistry::didMoveBetweenFrameHosts(*this, oldDocument.frameHost(), document().frameHost());
 
     if (WillBeHeapVector<OwnPtrWillBeMember<MutationObserverRegistration> >* registry = mutationObserverRegistry()) {
         for (size_t i = 0; i < registry->size(); ++i) {
@@ -1974,8 +1962,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 +1981,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 +1997,6 @@ void Node::removeAllEventListeners()
     if (hasEventListeners() && document().frameHost())
         document().frameHost()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     EventTarget::removeAllEventListeners();
-    document().didClearTouchEventHandlers(this);
 }
 
 void Node::removeAllEventListenersRecursively()