Changeset 214649 in webkit

Timestamp:

Mar 30, 2017, 7:08:07 PM (8 years ago)

Author:

Simon Fraser

Message:

Ensure that Node::willBeDeletedFrom() always removes touch event handlers from the document
​https://bugs.webkit.org/show_bug.cgi?id=170323
rdar://problem/23647630

Reviewed by Chris Dumez.

There are two instances where nodes are registered as touch event handlers without
having normal touch event listeners: slider thumb elements, and elements with overflow scrolling,
on iOS.

For such nodes, hasEventTargetData() will be false, but we want to ensure
that they are removed from the Document's touchEventHandler set, so move the
call to document.removeTouchEventHandler() outside of the conditional block.

This should be cheap in most cases when the touchEventHandler is empty.

• dom/Node.cpp:

(WebCore::Node::willBeDeletedFrom):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Ensure that Node::willBeDeletedFrom() always removes touch event handlers from the document
+        https://bugs.webkit.org/show_bug.cgi?id=170323
+        rdar://problem/23647630
+
+        Reviewed by Chris Dumez.
+
+        There are two instances where nodes are registered as touch event handlers without
+        having normal touch event listeners: slider thumb elements, and elements with overflow scrolling,
+        on iOS.
+
+        For such nodes, hasEventTargetData() will be false, but we want to ensure
+        that they are removed from the Document's touchEventHandler set, so move the
+        call to document.removeTouchEventHandler() outside of the conditional block.
+
+        This should be cheap in most cases when the touchEventHandler is empty.
+
+        * dom/Node.cpp:
+        (WebCore::Node::willBeDeletedFrom):
+
 2017-03-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -310 +310 @@
 #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
         document.removeTouchEventListener(this, true);
-        document.removeTouchEventHandler(this, true);
 #else
         // FIXME: This should call didRemoveTouchEventHandler().
 #endif
     }
+
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
+    document.removeTouchEventHandler(this, true);
+#endif
 
     if (AXObjectCache* cache = document.existingAXObjectCache())