Changeset 101736 in webkit

Timestamp:

Dec 1, 2011 7:39:11 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[MutationObservers] StyleAttributeMutationScope shouldn't be implemented with static classes
​https://bugs.webkit.org/show_bug.cgi?id=73596

Patch by Rafael Weinstein <​rafaelw@chromium.org> on 2011-12-01
Reviewed by Ojan Vafai.

No tests needed. This patch is a minor refactor.

• css/CSSMutableStyleDeclaration.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSMutableStyleDeclaration.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-01  Rafael Weinstein  <rafaelw@chromium.org>
+
+        [MutationObservers] StyleAttributeMutationScope shouldn't be implemented with static classes
+        https://bugs.webkit.org/show_bug.cgi?id=73596
+
+        Reviewed by Ojan Vafai.
+
+        No tests needed. This patch is a minor refactor.
+
+        * css/CSSMutableStyleDeclaration.cpp:
+
 2011-12-01  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp

@@ -68 +68 @@
 
         CSSInlineStyleDeclaration* inlineDecl = toCSSInlineStyleDeclaration(s_currentDecl);
-        s_mutationRecipients = MutationObserverInterestGroup::createForAttributesMutation(inlineDecl->element(), HTMLNames::styleAttr);
-        if (s_mutationRecipients->isEmpty()) {
-            s_mutationRecipients.clear();
+        m_mutationRecipients = MutationObserverInterestGroup::createForAttributesMutation(inlineDecl->element(), HTMLNames::styleAttr);
+        if (m_mutationRecipients->isEmpty()) {
+            m_mutationRecipients.clear();
             return;
         }
 
-        AtomicString oldValue = s_mutationRecipients->isOldValueRequested() ? inlineDecl->element()->getAttribute(HTMLNames::styleAttr) : nullAtom;
-        s_mutation = MutationRecord::createAttributes(inlineDecl->element(), HTMLNames::styleAttr, oldValue);
+        AtomicString oldValue = m_mutationRecipients->isOldValueRequested() ? inlineDecl->element()->getAttribute(HTMLNames::styleAttr) : nullAtom;
+        m_mutation = MutationRecord::createAttributes(inlineDecl->element(), HTMLNames::styleAttr, oldValue);
     }
 
@@ -81 +81 @@
     {
         --s_scopeCount;
-        if (!s_scopeCount)
-            s_currentDecl = 0;
+        if (s_scopeCount)
+            return;
+
+        s_currentDecl = 0;
+        if (m_mutation && s_shouldDeliver)
+            m_mutationRecipients->enqueueMutationRecord(m_mutation);
     }
 
     void enqueueMutationRecord()
     {
-        if (!s_mutation)
-            return;
-        s_mutationRecipients->enqueueMutationRecord(s_mutation);
-        s_mutation.clear();
-        s_mutationRecipients.clear();
+        s_shouldDeliver = true;
     }
 
 private:
     static unsigned s_scopeCount;
-    static OwnPtr<MutationObserverInterestGroup> s_mutationRecipients;
-    static RefPtr<MutationRecord> s_mutation;
     static CSSMutableStyleDeclaration* s_currentDecl;
+    static bool s_shouldDeliver;
+
+    OwnPtr<MutationObserverInterestGroup> m_mutationRecipients;
+    RefPtr<MutationRecord> m_mutation;
 };
 
 unsigned StyleAttributeMutationScope::s_scopeCount = 0;
-OwnPtr<MutationObserverInterestGroup> StyleAttributeMutationScope::s_mutationRecipients;
-RefPtr<MutationRecord> StyleAttributeMutationScope::s_mutation;
 CSSMutableStyleDeclaration* StyleAttributeMutationScope::s_currentDecl = 0;
+bool StyleAttributeMutationScope::s_shouldDeliver = false;
 
 } // namespace