Changeset 98163 in webkit

Timestamp:

Oct 21, 2011 3:52:29 PM (13 years ago)

Author:

adamk@chromium.org

Message:

[MutationObservers] Implement basic subtree observation
​https://bugs.webkit.org/show_bug.cgi?id=70436

Reviewed by Ryosuke Niwa.

Source/WebCore:

Note that this patch only implements "basic" subtree semantics,
not the fully robust semantics described in
​http://lists.w3.org/Archives/Public/public-webapps/2011JulSep/1622.html.
Most importantly, this change does not handle the case where mutations
occur in a temporarily detached subtree.

The plan is to implement those semantics in a followup to avoid
blocking other parts of the MutationObserver spec that rely on
the existence of subtree observation but not its specific
implementation.

Test: fast/mutation/observe-subtree.html

• dom/Node.cpp:

(WebCore::addMatchingObservers): Static helper method for registeredMutationObserversOfType().
(WebCore::Node::registeredMutationObserversOfType): Walk up the tree looking for observers.

• dom/NodeRareData.h:

(WebCore::MutationObserverEntry::hasAllOptions): A stricter, renamed from matches().

LayoutTests:

• fast/mutation/observe-subtree-expected.txt: Added.
• fast/mutation/observe-subtree.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mutation/observe-subtree-expected.txt (added)
• LayoutTests/fast/mutation/observe-subtree.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/dom/NodeRareData.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-21  Adam Klein  <adamk@chromium.org>
+
+        [MutationObservers] Implement basic subtree observation
+        https://bugs.webkit.org/show_bug.cgi?id=70436
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/mutation/observe-subtree-expected.txt: Added.
+        * fast/mutation/observe-subtree.html: Added.
+
 2011-10-21  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-21  Adam Klein  <adamk@chromium.org>
+
+        [MutationObservers] Implement basic subtree observation
+        https://bugs.webkit.org/show_bug.cgi?id=70436
+
+        Reviewed by Ryosuke Niwa.
+
+        Note that this patch only implements "basic" subtree semantics,
+        not the fully robust semantics described in
+        http://lists.w3.org/Archives/Public/public-webapps/2011JulSep/1622.html.
+        Most importantly, this change does not handle the case where mutations
+        occur in a temporarily detached subtree.
+
+        The plan is to implement those semantics in a followup to avoid
+        blocking other parts of the MutationObserver spec that rely on
+        the existence of subtree observation but not its specific
+        implementation.
+
+        Test: fast/mutation/observe-subtree.html
+
+        * dom/Node.cpp:
+        (WebCore::addMatchingObservers): Static helper method for registeredMutationObserversOfType().
+        (WebCore::Node::registeredMutationObserversOfType): Walk up the tree looking for observers.
+        * dom/NodeRareData.h:
+        (WebCore::MutationObserverEntry::hasAllOptions): A stricter, renamed from matches().
+
 2011-10-21  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -2699 +2699 @@
 }
 
+static void addMatchingObservers(HashSet<WebKitMutationObserver*>& observerSet, Vector<MutationObserverEntry>* observerEntries, MutationObserverOptions options)
+{
+    if (!observerEntries)
+        return;
+
+    const size_t size = observerEntries->size();
+    for (size_t i = 0; i < size; ++i) {
+        MutationObserverEntry& entry = observerEntries->at(i);
+        if (entry.hasAllOptions(options))
+            observerSet.add(entry.observer.get());
+    }
+}
+
 void Node::registeredMutationObserversOfType(Vector<WebKitMutationObserver*>& observers, WebKitMutationObserver::MutationType type)
 {
-    Vector<MutationObserverEntry>* observerEntries = mutationObserverEntries();
-    if (!observerEntries || observerEntries->isEmpty())
-        return;
-
-    for (size_t i = 0; i < observerEntries->size(); ++i) {
-        if ((*observerEntries)[i].matches(type))
-            observers.append((*observerEntries)[i].observer.get());
-    }
+    HashSet<WebKitMutationObserver*> observerSet;
+    addMatchingObservers(observerSet, mutationObserverEntries(), type);
+    for (Node* node = parentNode(); node; node = node->parentNode())
+        addMatchingObservers(observerSet, node->mutationObserverEntries(), type | WebKitMutationObserver::Subtree);
+
+    // FIXME: this method should output a HashSet instead of a Vector.
+    if (!observerSet.isEmpty())
+        copyToVector(observerSet, observers);
 }
 

trunk/Source/WebCore/dom/NodeRareData.h

@@ -102 +102 @@
     }
 
-    bool matches(MutationObserverOptions options) const
+    bool hasAllOptions(MutationObserverOptions options) const
     {
-        return this->options & options;
+        return (this->options & options) == options;
     }
 
@@ -110 +110 @@
     MutationObserverOptions options;
 };
-
 #endif // ENABLE(MUTATION_OBSERVERS)