Changeset 138754 in webkit

Timestamp:

Jan 3, 2013, 3:22:44 PM (12 years ago)

Author:

rafaelw@chromium.org

Message:

[Mutation Observers] prevent delivery while recipient context is suspended
​https://bugs.webkit.org/show_bug.cgi?id=105810

Reviewed by Adam Barth.

Source/WebCore:

Test: inspector/debugger/mutation-observer-suspend-while-paused.html

• dom/MutationObserver.cpp:

(WebCore::suspendedMutationObservers):
(WebCore):
(WebCore::MutationObserver::canDeliver):
(WebCore::MutationObserver::deliver):
(WebCore::MutationObserver::deliverAllMutations):

• dom/MutationObserver.h:

LayoutTests:

• inspector/debugger/mutation-observer-suspend-while-paused-expected.txt: Added.
• inspector/debugger/mutation-observer-suspend-while-paused.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/mutation-observer-suspend-while-paused-expected.txt (added)
• LayoutTests/inspector/debugger/mutation-observer-suspend-while-paused.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (1 diff)
• Source/WebCore/dom/MutationCallback.h (modified) (1 diff)
• Source/WebCore/dom/MutationObserver.cpp (modified) (4 diffs)
• Source/WebCore/dom/MutationObserver.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-03  Rafael Weinstein  <rafaelw@chromium.org>
+
+        [Mutation Observers] prevent delivery while recipient context is suspended
+        https://bugs.webkit.org/show_bug.cgi?id=105810
+
+        Reviewed by Adam Barth.
+
+        * inspector/debugger/mutation-observer-suspend-while-paused-expected.txt: Added.
+        * inspector/debugger/mutation-observer-suspend-while-paused.html: Added.
+
 2013-01-03  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-03  Rafael Weinstein  <rafaelw@chromium.org>
+
+        [Mutation Observers] prevent delivery while recipient context is suspended
+        https://bugs.webkit.org/show_bug.cgi?id=105810
+
+        Reviewed by Adam Barth.
+
+        Test: inspector/debugger/mutation-observer-suspend-while-paused.html
+
+        * dom/MutationObserver.cpp:
+        (WebCore::suspendedMutationObservers):
+        (WebCore):
+        (WebCore::MutationObserver::canDeliver):
+        (WebCore::MutationObserver::deliver):
+        (WebCore::MutationObserver::deliverAllMutations):
+        * dom/MutationObserver.h:
+
 2013-01-03  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -2830 +2830 @@
     push(@headerContent, "    }\n\n");
 
+    # ScriptExecutionContext
+    push(@headerContent, "    virtual ScriptExecutionContext* scriptExecutionContext() const { return ContextDestructionObserver::scriptExecutionContext(); }\n\n");
+
     # Destructor
     push(@headerContent, "    virtual ~$className();\n");

trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -3287 +3287 @@
 
     push(@headerContent, <<END);
+  
+    virtual ScriptExecutionContext* scriptExecutionContext() const { return ContextDestructionObserver::scriptExecutionContext(); }
 
 private:

trunk/Source/WebCore/dom/MutationCallback.h

@@ -50 +50 @@
 
     virtual bool handleEvent(MutationRecordArray*, MutationObserver*) = 0;
+    virtual ScriptExecutionContext* scriptExecutionContext() const = 0;
 };
 

trunk/Source/WebCore/dom/MutationObserver.cpp

@@ -155 +155 @@
 }
 
+static MutationObserverSet& suspendedMutationObservers()
+{
+    DEFINE_STATIC_LOCAL(MutationObserverSet, suspendedObservers, ());
+    return suspendedObservers;
+}
+
 void MutationObserver::enqueueMutationRecord(PassRefPtr<MutationRecord> mutation)
 {
@@ -176 +182 @@
 }
 
+bool MutationObserver::canDeliver()
+{
+    return !m_callback->scriptExecutionContext()->activeDOMObjectsAreSuspended();
+}
+
 void MutationObserver::deliver()
 {
+    ASSERT(canDeliver());
+
     // Calling clearTransientRegistrations() can modify m_registrations, so it's necessary
     // to make a copy of the transient registrations before operating on them.
@@ -205 +218 @@
     deliveryInProgress = true;
 
+    if (!suspendedMutationObservers().isEmpty()) {
+        Vector<RefPtr<MutationObserver> > suspended;
+        copyToVector(suspendedMutationObservers(), suspended);
+        for (size_t i = 0; i < suspended.size(); ++i) {
+            if (!suspended[i]->canDeliver())
+                continue;
+
+            suspendedMutationObservers().remove(suspended[i]);
+            activeMutationObservers().add(suspended[i]);
+        }
+    }
+
     while (!activeMutationObservers().isEmpty()) {
         Vector<RefPtr<MutationObserver> > observers;
@@ -210 +235 @@
         activeMutationObservers().clear();
         std::sort(observers.begin(), observers.end(), ObserverLessThan());
-        for (size_t i = 0; i < observers.size(); ++i)
-            observers[i]->deliver();
+        for (size_t i = 0; i < observers.size(); ++i) {
+            if (observers[i]->canDeliver())
+                observers[i]->deliver();
+            else
+                suspendedMutationObservers().add(observers[i]);
+        }
     }
 

trunk/Source/WebCore/dom/MutationObserver.h

@@ -87 +87 @@
     void enqueueMutationRecord(PassRefPtr<MutationRecord>);
     void setHasTransientRegistration();
+    bool canDeliver();
 
     HashSet<Node*> getObservedNodes() const;