Changeset 181615 in webkit

Timestamp:

Mar 16, 2015 9:43:52 PM (9 years ago)

Author:

Simon Fraser

Message:

Generalize the Document code that maintains a set of nodes with event handlers
​https://bugs.webkit.org/show_bug.cgi?id=142762

Reviewed by Zalan Bujtas, Darin Adler.

Document.h defines a TouchEventTargetSet type, which will in future be used for
other event types too (wheel events), so rename it to EventTargetSet.

Take didRemoveEventTargetNode() outside the TOUCH_EVENTS #ifdef, and change it
to take a reference.

• dom/Document.cpp:

(WebCore::Document::prepareForDestruction): References
(WebCore::Document::didAddTouchEventHandler): Ditto.
(WebCore::Document::didRemoveEventTargetNode): Ditto.

• dom/Document.h:

(WebCore::Document::touchEventTargets): No-one calls this; just remove the non

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::~HTMLInputElement): Pass a ref.
(WebCore::HTMLInputElement::didMoveToNewDocument): Pass a ref.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::removeAllEventListeners): Pass a ref.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)
• dom/Document.h (modified) (3 diffs)
• html/HTMLInputElement.cpp (modified) (2 diffs)
• page/DOMWindow.cpp (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Generalize the Document code that maintains a set of nodes with event handlers
+        https://bugs.webkit.org/show_bug.cgi?id=142762
+
+        Reviewed by Zalan Bujtas, Darin Adler.
+
+        Document.h defines a TouchEventTargetSet type, which will in future be used for
+        other event types too (wheel events), so rename it to EventTargetSet.
+        
+        Take didRemoveEventTargetNode() outside the TOUCH_EVENTS #ifdef, and change it
+        to take a reference.
+
+        * dom/Document.cpp:
+        (WebCore::Document::prepareForDestruction): References
+        (WebCore::Document::didAddTouchEventHandler): Ditto.
+        (WebCore::Document::didRemoveEventTargetNode): Ditto.
+        * dom/Document.h:
+        (WebCore::Document::touchEventTargets): No-one calls this; just remove the non
+        #ideffed one.
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::~HTMLInputElement): Pass a ref.
+        (WebCore::HTMLInputElement::didMoveToNewDocument): Pass a ref.
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::removeAllEventListeners): Pass a ref.
+
 2015-03-16  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2240 +2240 @@
 #if ENABLE(TOUCH_EVENTS)
     if (m_touchEventTargets && m_touchEventTargets->size() && parentDocument())
-        parentDocument()->didRemoveEventTargetNode(this);
+        parentDocument()->didRemoveEventTargetNode(*this);
 #endif
 
@@ -6013 +6013 @@
 #if ENABLE(TOUCH_EVENTS)
     if (!m_touchEventTargets.get())
-        m_touchEventTargets = std::make_unique<TouchEventTargetSet>();
+        m_touchEventTargets = std::make_unique<EventTargetSet>();
     m_touchEventTargets->add(&handler);
     if (Document* parent = parentDocument()) {
@@ -6055 +6055 @@
 }
 
+void Document::didRemoveEventTargetNode(Node& handler)
+{
 #if ENABLE(TOUCH_EVENTS)
-void Document::didRemoveEventTargetNode(Node* handler)
-{
     if (m_touchEventTargets) {
-        m_touchEventTargets->removeAll(handler);
-        if ((handler == this || m_touchEventTargets->isEmpty()) && parentDocument())
-            parentDocument()->didRemoveEventTargetNode(this);
-    }
-}
-#endif
+        m_touchEventTargets->removeAll(&handler);
+        if ((&handler == this || m_touchEventTargets->isEmpty()) && parentDocument())
+            parentDocument()->didRemoveEventTargetNode(*this);
+    }
+#else
+    UNUSED_PARAM(handler);
+#endif
+}
+
 void Document::updateLastHandledUserGestureTimestamp()
 {

trunk/Source/WebCore/dom/Document.h

@@ -240 +240 @@
 const int numNodeListInvalidationTypes = InvalidateOnAnyAttrChange + 1;
 
-typedef HashCountedSet<Node*> TouchEventTargetSet;
+typedef HashCountedSet<Node*> EventTargetSet;
 
 enum DocumentClass {
@@ -1138 +1138 @@
     void didRemoveTouchEventHandler(Node&);
 
+    void didRemoveEventTargetNode(Node&);
+
+    const EventTargetSet* touchEventTargets() const
+    {
 #if ENABLE(TOUCH_EVENTS)
-    void didRemoveEventTargetNode(Node*);
-#endif
-
-#if ENABLE(TOUCH_EVENTS)
-    const TouchEventTargetSet* touchEventTargets() const { return m_touchEventTargets.get(); }
+        return m_touchEventTargets.get();
 #else
-    const TouchEventTargetSet* touchEventTargets() const { return 0; }
-#endif
+        return nullptr;
+#endif
+    }
 
     bool visualUpdatesAllowed() const { return m_visualUpdatesAllowed; }
@@ -1559 +1560 @@
     unsigned m_wheelEventHandlerCount;
 #if ENABLE(TOUCH_EVENTS)
-    std::unique_ptr<TouchEventTargetSet> m_touchEventTargets;
+    std::unique_ptr<EventTargetSet> m_touchEventTargets;
 #endif
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -167 +167 @@
 #if ENABLE(TOUCH_EVENTS)
     if (m_hasTouchEventHandler)
-        document().didRemoveEventTargetNode(this);
+        document().didRemoveEventTargetNode(*this);
 #endif
 }
@@ -1507 +1507 @@
 #if ENABLE(TOUCH_EVENTS)
         if (m_hasTouchEventHandler)
-            oldDocument->didRemoveEventTargetNode(this);
+            oldDocument->didRemoveEventTargetNode(*this);
 #endif
     }

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1934 +1934 @@
 #if ENABLE(TOUCH_EVENTS)
     if (Document* document = this->document())
-        document->didRemoveEventTargetNode(document);
+        document->didRemoveEventTargetNode(*document);
 #endif
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -1214 +1214 @@
     }
 
-    const TouchEventTargetSet* touchHandlers = document->touchEventTargets();
+    auto touchHandlers = document->touchEventTargets();
     if (!touchHandlers)
         return 0;
 
     unsigned count = 0;
-    for (TouchEventTargetSet::const_iterator iter = touchHandlers->begin(); iter != touchHandlers->end(); ++iter)
-        count += iter->value;
+    for (auto& handler : *touchHandlers)
+        count += handler.value;
+
     return count;
 }