Changeset 109058 in webkit

Timestamp:

Feb 27, 2012 6:34:20 PM (12 years ago)

Author:

adamk@chromium.org

Message:

[MutationObservers] Clear pending mutation records on disconnect()
​https://bugs.webkit.org/show_bug.cgi?id=78639

Reviewed by Ojan Vafai.

Source/WebCore:

Test: fast/mutation/disconnect-cancel-pending.html

• dom/WebKitMutationObserver.cpp:

(WebCore::WebKitMutationObserver::disconnect): Clear pending records.
(WebCore::WebKitMutationObserver::deliver): Avoid calling the callback if no records are pending delivery.

LayoutTests:

• fast/mutation/disconnect-cancel-pending-expected.txt: Added.
• fast/mutation/disconnect-cancel-pending.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mutation/disconnect-cancel-pending-expected.txt (added)
• LayoutTests/fast/mutation/disconnect-cancel-pending.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/WebKitMutationObserver.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-27  Adam Klein  <adamk@chromium.org>
+
+        [MutationObservers] Clear pending mutation records on disconnect()
+        https://bugs.webkit.org/show_bug.cgi?id=78639
+
+        Reviewed by Ojan Vafai.
+
+        * fast/mutation/disconnect-cancel-pending-expected.txt: Added.
+        * fast/mutation/disconnect-cancel-pending.html: Added.
+
 2012-02-27  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-27  Adam Klein  <adamk@chromium.org>
+
+        [MutationObservers] Clear pending mutation records on disconnect()
+        https://bugs.webkit.org/show_bug.cgi?id=78639
+
+        Reviewed by Ojan Vafai.
+
+        Test: fast/mutation/disconnect-cancel-pending.html
+
+        * dom/WebKitMutationObserver.cpp:
+        (WebCore::WebKitMutationObserver::disconnect): Clear pending records.
+        (WebCore::WebKitMutationObserver::deliver): Avoid calling the callback if no records are pending delivery.
+
 2012-02-27  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/dom/WebKitMutationObserver.cpp

@@ -90 +90 @@
 void WebKitMutationObserver::disconnect()
 {
+    m_records.clear();
     HashSet<MutationObserverRegistration*> registrations(m_registrations);
     for (HashSet<MutationObserverRegistration*>::iterator iter = registrations.begin(); iter != registrations.end(); ++iter)
@@ -124 +125 @@
 void WebKitMutationObserver::deliver()
 {
+    if (m_records.isEmpty())
+        return;
+
     MutationRecordArray records;
     records.swap(m_records);