Attachment 111668 Details for Bug 70436 – Patch

[patch] Patch

bug-70436-20111019134554.patch (text/plain), 13.46 KB, created by Adam Klein on 2011-10-19 13:45:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Klein

Created: 2011-10-19 13:45:55 PDT

Size: 13.46 KB

patch

obsolete

>Subversion Revision: 97809
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 470d6e0c60dc14fb3f9ad80949edc8767e032e03..ad18804abfbae79c00eee5c08012d904ef6bb546 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2011-10-19  Adam Klein  <adamk@chromium.org>
>+
>+        [MutationObservers] Implement basic subtree observation
>+        https://bugs.webkit.org/show_bug.cgi?id=70436
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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::Node::clearRareData):
>+        (WebCore::Node::registeredMutationObserversOfType):
>+        (WebCore::Node::registerMutationObserver):
>+        * dom/NodeRareData.h:
>+        (WebCore::MutationObserverEntry::MutationObserverEntry): Converted to a proper class, as more methods were needed.
>+        (WebCore::MutationObserverEntry::observer):
>+        (WebCore::MutationObserverEntry::setObserver):
>+        (WebCore::MutationObserverEntry::options):
>+        (WebCore::MutationObserverEntry::setOptions):
>+        (WebCore::MutationObserverEntry::matches):
>+        (WebCore::MutationObserverEntry::isSubtree):
>+        (WebCore::MutationObserverEntry::operator==):
>+
> 2011-10-18  Adrienne Walker  <enne@google.com>
> 
>         [chromium] Preserve offscreen tiles instead of immediately recycling them
>diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
>index 1f85fd912eadfd5a73159d6dede930e64849c940..d9517629e9e0da9d91bfc1c7a5714aa4eee63977 100644
>--- a/Source/WebCore/dom/Node.cpp
>+++ b/Source/WebCore/dom/Node.cpp
>@@ -551,7 +551,7 @@ void Node::clearRareData()
>     Vector<MutationObserverEntry>* observerEntries = mutationObserverEntries();
>     if (observerEntries) {
>         for (size_t i = 0; i < observerEntries->size(); ++i)
>-            observerEntries->at(i).observer->observedNodeDestructed(this);
>+            observerEntries->at(i).observer()->observedNodeDestructed(this);
>     }
> #endif
> 
>@@ -2690,14 +2690,29 @@ Vector<MutationObserverEntry>* Node::mutationObserverEntries()
> 
> void Node::registeredMutationObserversOfType(Vector<WebKitMutationObserver*>& observers, WebKitMutationObserver::MutationType type)
> {
>-    Vector<MutationObserverEntry>* observerEntries = mutationObserverEntries();
>-    if (!observerEntries || observerEntries->isEmpty())
>-        return;
>-
>-    for (Vector<MutationObserverEntry>::iterator iter = observerEntries->begin(); iter != observerEntries->end(); ++iter) {
>-        if (iter->matches(type))
>-            observers.append(iter->observer.get());
>+    HashSet<WebKitMutationObserver*> observerSet;
>+    if (Vector<MutationObserverEntry>* observerEntries = mutationObserverEntries()) {
>+        const size_t size = observerEntries->size();
>+        for (size_t i = 0; i < size; ++i) {
>+            MutationObserverEntry& entry = observerEntries->at(i);
>+            if (entry.matches(type))
>+                observerSet.add(entry.observer());
>+        }
>     }
>+    for (Node* node = parentNode(); node; node = node->parentNode()) {
>+        if (Vector<MutationObserverEntry>* observerEntries = node->mutationObserverEntries()) {
>+            const size_t size = observerEntries->size();
>+            for (size_t i = 0; i < size; ++i) {
>+                MutationObserverEntry& entry = observerEntries->at(i);
>+                if (entry.matches(type) && entry.isSubtree())
>+                    observerSet.add(entry.observer());
>+            }
>+        }
>+    }
>+
>+    // FIXME: this method should output a HashSet instead of a Vector.
>+    if (!observerSet.isEmpty())
>+        copyToVector(observerSet, observers);
> }
> 
> Node::MutationRegistrationResult Node::registerMutationObserver(PassRefPtr<WebKitMutationObserver> observer, MutationObserverOptions options)
>@@ -2711,7 +2726,7 @@ Node::MutationRegistrationResult Node::registerMutationObserver(PassRefPtr<WebKi
>         return MutationObserverRegistered;
>     }
> 
>-    (*observerEntries)[index].options = entry.options;
>+    (*observerEntries)[index].setOptions(entry.options());
>     return MutationRegistrationOptionsReset;
> }
> 
>diff --git a/Source/WebCore/dom/NodeRareData.h b/Source/WebCore/dom/NodeRareData.h
>index e258afa4e26c0da206de648916df28a9d9faede6..4084d88fe2657911fe62008d41602ba9304aca3d 100644
>--- a/Source/WebCore/dom/NodeRareData.h
>+++ b/Source/WebCore/dom/NodeRareData.h
>@@ -89,27 +89,39 @@ private:
> };
> 
> #if ENABLE(MUTATION_OBSERVERS)
>-struct MutationObserverEntry {
>+class MutationObserverEntry {
>+public:
>     MutationObserverEntry(PassRefPtr<WebKitMutationObserver> observer, MutationObserverOptions options)
>-        : observer(observer)
>-        , options(options)
>+        : m_observer(observer)
>+        , m_options(options)
>     {
>     }
> 
>-    bool operator==(const MutationObserverEntry& other) const
>+    WebKitMutationObserver* observer() { return m_observer.get(); }
>+    void setObserver(PassRefPtr<WebKitMutationObserver> observer) { m_observer = observer; }
>+
>+    MutationObserverOptions options() const { return m_options; }
>+    void setOptions(MutationObserverOptions options) { m_options = options; }
>+
>+    bool matches(WebKitMutationObserver::MutationType type) const
>     {
>-        return observer == other.observer;
>+        return m_options & type;
>     }
> 
>-    bool matches(MutationObserverOptions options) const
>+    bool isSubtree() const
>     {
>-        return this->options & options;
>+        return m_options & WebKitMutationObserver::Subtree;
>     }
> 
>-    RefPtr<WebKitMutationObserver> observer;
>-    MutationObserverOptions options;
>-};
>+    bool operator==(const MutationObserverEntry& other) const
>+    {
>+        return m_observer == other.m_observer;
>+    }
> 
>+private:
>+    RefPtr<WebKitMutationObserver> m_observer;
>+    MutationObserverOptions m_options;
>+};
> #endif // ENABLE(MUTATION_OBSERVERS)
> 
> class NodeRareData {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c303eed93e2d21d14c8231cb81ba706d1e6f483f..649ed065a0fbd8b9432941649b83ab9218ee9966 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2011-10-19  Adam Klein  <adamk@chromium.org>
>+
>+        [MutationObservers] Implement basic subtree observation
>+        https://bugs.webkit.org/show_bug.cgi?id=70436
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/mutation/observe-subtree-expected.txt: Added.
>+        * fast/mutation/observe-subtree.html: Added.
>+
> 2011-10-18  Adam Klein  <adamk@chromium.org>
> 
>         [MutationObservers] Implement WebKitMutationObserver.observe for characterData changes
>diff --git a/LayoutTests/fast/mutation/observe-subtree-expected.txt b/LayoutTests/fast/mutation/observe-subtree-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..5527eb1ac30e0241247dd1a91273073eb46ea3af
>--- /dev/null
>+++ b/LayoutTests/fast/mutation/observe-subtree-expected.txt
>@@ -0,0 +1,39 @@
>+Test WebKitMutationObserver.observe on a subtree
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Testing basic aspects of subtree observation.
>+...attribute and characterData changes in subtree
>+PASS mutations.length is 2
>+PASS mutations[0].type is "attributes"
>+PASS mutations[0].target is subDiv
>+PASS mutations[0].attributeName is "foo"
>+PASS mutations[0].attributeNamespace is null
>+PASS mutations[1].type is "characterData"
>+PASS mutations[1].target is subDiv.firstChild
>+
>+Testing two observers at different depths.
>+PASS mutations.length is 1
>+PASS mutations[0].type is "attributes"
>+PASS mutations[0].target is subDiv
>+PASS mutations[0].attributeName is "foo"
>+PASS mutations[0].attributeNamespace is null
>+PASS mutations2.length is 1
>+PASS mutations2[0].type is "attributes"
>+PASS mutations2[0].target is subDiv
>+PASS mutations2[0].attributeName is "foo"
>+PASS mutations2[0].attributeNamespace is null
>+
>+Testing one observer at two different depths.
>+PASS calls is 1
>+PASS mutations.length is 1
>+PASS mutations[0].type is "attributes"
>+PASS mutations[0].target is subDiv
>+PASS mutations[0].attributeName is "foo"
>+PASS mutations[0].attributeNamespace is null
>+
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/mutation/observe-subtree.html b/LayoutTests/fast/mutation/observe-subtree.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ac1fbc9c355c90e5210b6496c4123d797b759a2d
>--- /dev/null
>+++ b/LayoutTests/fast/mutation/observe-subtree.html
>@@ -0,0 +1,160 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<meta charset="utf-8">
>+<link rel="stylesheet" href="../js/resources/js-test-style.css">
>+<script src="../js/resources/js-test-pre.js"></script>
>+<title></title>
>+</head>
>+<body>
>+<p id=description></p>
>+<div id="console"></div>
>+<script>
>+
>+window.jsTestIsAsync = true;
>+var mutations;
>+var mutations2;
>+var div;
>+var subDiv;
>+var calls;
>+
>+function testBasic() {
>+    var observer;
>+
>+    function start() {
>+        debug('Testing basic aspects of subtree observation.');
>+
>+        mutations = null;
>+        div = document.createElement('div');
>+        subDiv = div.appendChild(document.createElement('div'));
>+        subDiv.innerHTML = 'hello, world';
>+        observer = new WebKitMutationObserver(function(m) {
>+            mutations = m;
>+        });
>+
>+        observer.observe(div, {attributes: true, characterData: true, subtree: true});
>+        subDiv.setAttribute('foo', 'bar');
>+        subDiv.firstChild.textContent = 'goodbye!';
>+        setTimeout(finish, 0);
>+    }
>+
>+    function finish() {
>+        debug('...attribute and characterData changes in subtree');
>+
>+        shouldBe('mutations.length', '2');
>+        shouldBe('mutations[0].type', '"attributes"');
>+        shouldBe('mutations[0].target', 'subDiv');
>+        shouldBe('mutations[0].attributeName', '"foo"');
>+        shouldBe('mutations[0].attributeNamespace', 'null');
>+        shouldBe('mutations[1].type', '"characterData"');
>+        shouldBe('mutations[1].target', 'subDiv.firstChild');
>+        observer.disconnect();
>+        debug('');
>+        runNextTest();
>+    }
>+
>+    start();
>+}
>+
>+function testMultipleObservers() {
>+    var observer;
>+    var observer2;
>+
>+    function start() {
>+        debug('Testing two observers at different depths.');
>+
>+        mutations = null;
>+        mutations2 = null;
>+        div = document.createElement('div');
>+        subDiv = div.appendChild(document.createElement('div'));
>+        observer = new WebKitMutationObserver(function(m) {
>+            mutations = m;
>+        });
>+        observer2 = new WebKitMutationObserver(function(m) {
>+            mutations2 = m;
>+        });
>+
>+        observer.observe(div, {attributes: true, subtree: true});
>+        observer2.observe(subDiv, {attributes: true});
>+        subDiv.setAttribute('foo', 'bar');
>+        setTimeout(finish, 0);
>+    }
>+
>+    function finish() {
>+        shouldBe('mutations.length', '1');
>+        shouldBe('mutations[0].type', '"attributes"');
>+        shouldBe('mutations[0].target', 'subDiv');
>+        shouldBe('mutations[0].attributeName', '"foo"');
>+        shouldBe('mutations[0].attributeNamespace', 'null');
>+        shouldBe('mutations2.length', '1');
>+        shouldBe('mutations2[0].type', '"attributes"');
>+        shouldBe('mutations2[0].target', 'subDiv');
>+        shouldBe('mutations2[0].attributeName', '"foo"');
>+        shouldBe('mutations2[0].attributeNamespace', 'null');
>+        observer.disconnect();
>+        observer2.disconnect();
>+        debug('');
>+        runNextTest();
>+    }
>+
>+    start();
>+}
>+
>+function testMultipleObservations() {
>+    var observer;
>+
>+    function start() {
>+        debug('Testing one observer at two different depths.');
>+
>+        mutations = null;
>+        calls = 0;
>+        div = document.createElement('div');
>+        subDiv = div.appendChild(document.createElement('div'));
>+        observer = new WebKitMutationObserver(function(m) {
>+            mutations = m;
>+            ++calls;
>+        });
>+
>+        observer.observe(div, {attributes: true, subtree: true});
>+        observer.observe(subDiv, {attributes: true, subtree: true});
>+        subDiv.setAttribute('foo', 'bar');
>+        setTimeout(finish, 0);
>+    }
>+
>+    function finish() {
>+        shouldBe('calls', '1');
>+        shouldBe('mutations.length', '1');
>+        shouldBe('mutations[0].type', '"attributes"');
>+        shouldBe('mutations[0].target', 'subDiv');
>+        shouldBe('mutations[0].attributeName', '"foo"');
>+        shouldBe('mutations[0].attributeNamespace', 'null');
>+        observer.disconnect();
>+        debug('');
>+        runNextTest();
>+    }
>+
>+    start();
>+}
>+var tests = [testBasic, testMultipleObservers, testMultipleObservations];
>+var testIndex = 0;
>+
>+function runNextTest() {
>+    if (testIndex < tests.length)
>+        tests[testIndex++]();
>+    else
>+        finishJSTest();
>+}
>+
>+description('Test WebKitMutationObserver.observe on a subtree');
>+
>+if (!window.WebKitMutationObserver)
>+    testFailed('This test requires ENABLE(MUTATION_OBSERVERS)');
>+else
>+    runNextTest();
>+
>+var successfullyParsed = true;
>+
>+</script>
>+<script src="../js/resources/js-test-post.js"></script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 70436: 111668 | 111856 | 112009 | 112033