Title: [207920] branches/safari-602-branch/Source/WebCore
Revision
207920
Author
matthew_han...@apple.com
Date
2016-10-26 16:18:02 -0700 (Wed, 26 Oct 2016)

Log Message

Merge r207477. rdar://problem/28810756

Modified Paths

Diff

Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207919 => 207920)


--- branches/safari-602-branch/Source/WebCore/ChangeLog	2016-10-26 23:17:59 UTC (rev 207919)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog	2016-10-26 23:18:02 UTC (rev 207920)
@@ -1,5 +1,23 @@
 2016-10-26  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r207477. rdar://problem/28810756
+
+    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-26  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r207221. rdar://problem/28894492
 
     2016-10-12  Brent Fulgham  <bfulg...@apple.com>

Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (207919 => 207920)


--- branches/safari-602-branch/Source/WebCore/dom/Document.cpp	2016-10-26 23:17:59 UTC (rev 207919)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.cpp	2016-10-26 23:18:02 UTC (rev 207920)
@@ -2417,6 +2417,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