Changeset 110465 in webkit

Timestamp:

Mar 12, 2012 1:11:16 PM (12 years ago)

Author:

adamk@chromium.org

Message:

[MutationObservers] Enforce a consistent order of MutationRecord delivery
​https://bugs.webkit.org/show_bug.cgi?id=80549

Reviewed by Ojan Vafai.

Source/WebCore:

Mutations should be delivered in order of creation.

Tests: fast/mutation/create-during-delivery.html

fast/mutation/delivery-order.html
fast/mutation/mutate-during-delivery.html

• dom/WebKitMutationObserver.cpp:

(WebCore):
(WebCore::WebKitMutationObserver::ObserverLessThan::operator()): Functor for use with std::sort.
(WebCore::WebKitMutationObserver::create):
(WebCore::WebKitMutationObserver::WebKitMutationObserver):
(WebCore::WebKitMutationObserver::deliverAllMutations): Move observers into a sorted vector before delivery.

• dom/WebKitMutationObserver.h: Add a "priority" member which monotonically increases with each construction.

LayoutTests:

• fast/mutation/create-during-delivery-expected.txt: Added.
• fast/mutation/create-during-delivery.html: Added.
• fast/mutation/delivery-order.html: Added.
• fast/mutation/mutate-during-delivery-expected.txt: Added.
• fast/mutation/mutate-during-delivery.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mutation/create-during-delivery-expected.txt (added)
• LayoutTests/fast/mutation/create-during-delivery.html (added)
• LayoutTests/fast/mutation/delivery-order.html (added)
• LayoutTests/fast/mutation/mutate-during-delivery-expected.txt (added)
• LayoutTests/fast/mutation/mutate-during-delivery.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/WebKitMutationObserver.cpp (modified) (4 diffs)
• Source/WebCore/dom/WebKitMutationObserver.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-12  Adam Klein  <adamk@chromium.org>
+
+        [MutationObservers] Enforce a consistent order of MutationRecord delivery
+        https://bugs.webkit.org/show_bug.cgi?id=80549
+
+        Reviewed by Ojan Vafai.
+
+        * fast/mutation/create-during-delivery-expected.txt: Added.
+        * fast/mutation/create-during-delivery.html: Added.
+        * fast/mutation/delivery-order.html: Added.
+        * fast/mutation/mutate-during-delivery-expected.txt: Added.
+        * fast/mutation/mutate-during-delivery.html: Added.
+
 2012-03-12  Mike Lawther  <mikelawther@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-12  Adam Klein  <adamk@chromium.org>
+
+        [MutationObservers] Enforce a consistent order of MutationRecord delivery
+        https://bugs.webkit.org/show_bug.cgi?id=80549
+
+        Reviewed by Ojan Vafai.
+
+        Mutations should be delivered in order of creation.
+
+        Tests: fast/mutation/create-during-delivery.html
+               fast/mutation/delivery-order.html
+               fast/mutation/mutate-during-delivery.html
+
+        * dom/WebKitMutationObserver.cpp:
+        (WebCore):
+        (WebCore::WebKitMutationObserver::ObserverLessThan::operator()): Functor for use with std::sort.
+        (WebCore::WebKitMutationObserver::create):
+        (WebCore::WebKitMutationObserver::WebKitMutationObserver):
+        (WebCore::WebKitMutationObserver::deliverAllMutations): Move observers into a sorted vector before delivery.
+        * dom/WebKitMutationObserver.h: Add a "priority" member which monotonically increases with each construction.
+
 2012-03-12  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/dom/WebKitMutationObserver.cpp

@@ -41 +41 @@
 #include "MutationRecord.h"
 #include "Node.h"
-#include <wtf/ListHashSet.h>
+#include <algorithm>
+#include <wtf/HashSet.h>
 #include <wtf/MainThread.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {
 
+static unsigned s_observerPriority = 0;
+
+struct WebKitMutationObserver::ObserverLessThan {
+    bool operator()(const RefPtr<WebKitMutationObserver>& lhs, const RefPtr<WebKitMutationObserver>& rhs)
+    {
+        return lhs->m_priority < rhs->m_priority;
+    }
+};
+
 PassRefPtr<WebKitMutationObserver> WebKitMutationObserver::create(PassRefPtr<MutationCallback> callback)
 {
+    ASSERT(isMainThread());
     return adoptRef(new WebKitMutationObserver(callback));
 }
@@ -53 +65 @@
 WebKitMutationObserver::WebKitMutationObserver(PassRefPtr<MutationCallback> callback)
     : m_callback(callback)
+    , m_priority(s_observerPriority++)
 {
 }
@@ -108 +121 @@
 }
 
-typedef ListHashSet<RefPtr<WebKitMutationObserver> > MutationObserverSet;
+typedef HashSet<RefPtr<WebKitMutationObserver> > MutationObserverSet;
 
 static MutationObserverSet& activeMutationObservers()
@@ -146 +159 @@
 
     while (!activeMutationObservers().isEmpty()) {
-        MutationObserverSet::iterator iter = activeMutationObservers().begin();
-        RefPtr<WebKitMutationObserver> observer = *iter;
-        activeMutationObservers().remove(iter);
-        observer->deliver();
+        Vector<RefPtr<WebKitMutationObserver> > observers;
+        copyToVector(activeMutationObservers(), observers);
+        activeMutationObservers().clear();
+        std::sort(observers.begin(), observers.end(), ObserverLessThan());
+        for (size_t i = 0; i < observers.size(); ++i)
+            observers[i]->deliver();
     }
 

trunk/Source/WebCore/dom/WebKitMutationObserver.h

@@ -86 +86 @@
 
 private:
+    struct ObserverLessThan;
+
     WebKitMutationObserver(PassRefPtr<MutationCallback>);
     void deliver();
@@ -94 +96 @@
     Vector<RefPtr<MutationRecord> > m_records;
     HashSet<MutationObserverRegistration*> m_registrations;
+    unsigned m_priority;
 };