Title: [207972] releases/WebKitGTK/webkit-2.14/Source/WebCore
Revision
207972
Author
carlo...@webkit.org
Date
2016-10-27 02:56:02 -0700 (Thu, 27 Oct 2016)

Log Message

Merge r207477 - Correct Document::removeAllEventListeners
https://bugs.webkit.org/show_bug.cgi?id=163558
<rdar://problem/28716840>

Reviewed by Chris Dumez.

Tested by fast/dom/node-move-to-new-document-crash-main.html.

* dom/Document.cpp:
(WebCore::Document::removeAllEventListeners): Clear out the wheel and
touch event targets when clearing all data.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207971 => 207972)


--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog	2016-10-27 09:54:57 UTC (rev 207971)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog	2016-10-27 09:56:02 UTC (rev 207972)
@@ -1,3 +1,17 @@
+2016-10-18  Brent Fulgham  <bfulg...@apple.com>
+
+        Correct Document::removeAllEventListeners
+        https://bugs.webkit.org/show_bug.cgi?id=163558
+        <rdar://problem/28716840>
+
+        Reviewed by Chris Dumez.
+
+        Tested by fast/dom/node-move-to-new-document-crash-main.html.
+
+        * dom/Document.cpp:
+        (WebCore::Document::removeAllEventListeners): Clear out the wheel and
+        touch event targets when clearing all data.
+
 2016-10-18  Said Abou-Hallawa  <sabouhall...@apple.com>
 
         SVGCSSParser: m_implicitShorthand value is not reset after adding the shorthand property

Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp (207971 => 207972)


--- releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp	2016-10-27 09:54:57 UTC (rev 207971)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Document.cpp	2016-10-27 09:56:02 UTC (rev 207972)
@@ -2427,6 +2427,11 @@
 #endif
     for (Node* node = firstChild(); node; node = NodeTraversal::next(*node))
         node->removeAllEventListeners();
+
+#if ENABLE(TOUCH_EVENTS)
+    m_touchEventTargets = nullptr;
+#endif
+    m_wheelEventTargets = nullptr;
 }
 
 void Document::suspendDeviceMotionAndOrientationUpdates()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to