Changeset 214702 in webkit

Timestamp:

Mar 31, 2017, 5:10:59 PM (8 years ago)

Author:

Simon Fraser

Message:

When destroying a Node, assert that it's been removed from all the touch handler maps
​https://bugs.webkit.org/show_bug.cgi?id=170363
rdar://problem/31377469

Reviewed by Tim Horton.

Assert that the Node has been removed from the touch handler maps in all documents on destruction.

• dom/Document.h:

(WebCore::Document::hasTouchEventHandlers):
(WebCore::Document::touchEventTargetsContain):

• dom/Node.cpp:

(WebCore::Node::~Node):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.h (modified) (2 diffs)
• dom/Node.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2017-03-31  Simon Fraser  <simon.fraser@apple.com>
+
+        When destroying a Node, assert that it's been removed from all the touch handler maps
+        https://bugs.webkit.org/show_bug.cgi?id=170363
+        rdar://problem/31377469
+
+        Reviewed by Tim Horton.
+
+        Assert that the Node has been removed from the touch handler maps in all documents on destruction.
+
+        * dom/Document.h:
+        (WebCore::Document::hasTouchEventHandlers):
+        (WebCore::Document::touchEventTargetsContain):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+
 2017-03-31  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/Document.h ¶

@@ -1146 +1146 @@
     void updateLastHandledUserGestureTimestamp();
 
-#if ENABLE(TOUCH_EVENTS)
-    bool hasTouchEventHandlers() const { return (m_touchEventTargets.get()) ? m_touchEventTargets->size() : false; }
-#else
-    bool hasTouchEventHandlers() const { return false; }
-#endif
-
     // Used for testing. Count handlers in the main document, and one per frame which contains handlers.
     WEBCORE_EXPORT unsigned wheelEventHandlerCount() const;
@@ -1158 +1152 @@
     WEBCORE_EXPORT void startTrackingStyleRecalcs();
     WEBCORE_EXPORT unsigned styleRecalcCount() const;
+
+#if ENABLE(TOUCH_EVENTS)
+    bool hasTouchEventHandlers() const { return (m_touchEventTargets.get()) ? m_touchEventTargets->size() : false; }
+    bool touchEventTargetsContain(Node& node) const { return m_touchEventTargets ? m_touchEventTargets->contains(&node) : false; }
+#else
+    bool hasTouchEventHandlers() const { return false; }
+    bool touchEventTargetsContain(Node&) const { return false; }
+#endif
 
     void didAddTouchEventHandler(Node&);

trunk/Source/WebCore/dom/Node.cpp ¶

@@ -302 +302 @@
 
     document().decrementReferencingNodeCount();
+
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS) && (!ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS))
+    for (auto* document : Document::allDocuments()) {
+        ASSERT_WITH_SECURITY_IMPLICATION(!document->touchEventListenersContain(*this));
+        ASSERT_WITH_SECURITY_IMPLICATION(!document->touchEventHandlersContain(*this));
+        ASSERT_WITH_SECURITY_IMPLICATION(!document->touchEventTargetsContain(*this));
+    }
+#endif
 }