Changeset 102882 in webkit

Timestamp:

Dec 14, 2011 9:26:55 PM (12 years ago)

Author:

adamk@chromium.org

Message:

Optimize MutationObserverInterestGroup construction
​https://bugs.webkit.org/show_bug.cgi?id=74563

Reviewed by Ojan Vafai.

Inline MutationObserverInterestGroup's creation methods and fix an
accidental pass-by-value in an attempt to further reduce the CPU
footprint of MutationObservers.

No new tests, refactor only.

• dom/WebKitMutationObserver.cpp:

(WebCore::MutationObserverInterestGroup::MutationObserverInterestGroup): Pass observers HashMap by reference.

• dom/WebKitMutationObserver.h:

(WebCore::MutationObserverInterestGroup::createForChildListMutation): Inline.
(WebCore::MutationObserverInterestGroup::createForCharacterDataMutation): Inline.
(WebCore::MutationObserverInterestGroup::createForAttributesMutation): Inline.
(WebCore::MutationObserverInterestGroup::hasOldValue): Remove spurious inline keyword.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/WebKitMutationObserver.cpp (modified) (1 diff)
• dom/WebKitMutationObserver.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-14  Adam Klein  <adamk@chromium.org>
+
+        Optimize MutationObserverInterestGroup construction
+        https://bugs.webkit.org/show_bug.cgi?id=74563
+
+        Reviewed by Ojan Vafai.
+
+        Inline MutationObserverInterestGroup's creation methods and fix an
+        accidental pass-by-value in an attempt to further reduce the CPU
+        footprint of MutationObservers.
+
+        No new tests, refactor only.
+
+        * dom/WebKitMutationObserver.cpp:
+        (WebCore::MutationObserverInterestGroup::MutationObserverInterestGroup): Pass observers HashMap by reference.
+        * dom/WebKitMutationObserver.h:
+        (WebCore::MutationObserverInterestGroup::createForChildListMutation): Inline.
+        (WebCore::MutationObserverInterestGroup::createForCharacterDataMutation): Inline.
+        (WebCore::MutationObserverInterestGroup::createForAttributesMutation): Inline.
+        (WebCore::MutationObserverInterestGroup::hasOldValue): Remove spurious inline keyword.
+
 2011-12-14  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/dom/WebKitMutationObserver.cpp

@@ -163 +163 @@
 }
 
-PassOwnPtr<MutationObserverInterestGroup> MutationObserverInterestGroup::createForChildListMutation(Node* target)
-{
-    MutationRecordDeliveryOptions oldValueFlag = 0;
-    return createIfNeeded(target, WebKitMutationObserver::ChildList, nullAtom, oldValueFlag);
-}
-
-PassOwnPtr<MutationObserverInterestGroup> MutationObserverInterestGroup::createForCharacterDataMutation(Node* target)
-{
-    return createIfNeeded(target, WebKitMutationObserver::CharacterData, nullAtom, WebKitMutationObserver::CharacterDataOldValue);
-}
-
-PassOwnPtr<MutationObserverInterestGroup> MutationObserverInterestGroup::createForAttributesMutation(Node* target, const QualifiedName& attributeName)
-{
-    return createIfNeeded(target, WebKitMutationObserver::Attributes, attributeName.localName(), WebKitMutationObserver::AttributeOldValue);
-}
-
-MutationObserverInterestGroup::MutationObserverInterestGroup(HashMap<WebKitMutationObserver*, MutationRecordDeliveryOptions> observers, MutationRecordDeliveryOptions oldValueFlag)
+MutationObserverInterestGroup::MutationObserverInterestGroup(HashMap<WebKitMutationObserver*, MutationRecordDeliveryOptions>& observers, MutationRecordDeliveryOptions oldValueFlag)
     : m_oldValueFlag(oldValueFlag)
 {

trunk/Source/WebCore/dom/WebKitMutationObserver.h

@@ -34 +34 @@
 #if ENABLE(MUTATION_OBSERVERS)
 
+#include "QualifiedName.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -99 +101 @@
 class MutationObserverInterestGroup {
 public:
-    static PassOwnPtr<MutationObserverInterestGroup> createForChildListMutation(Node* target);
-    static PassOwnPtr<MutationObserverInterestGroup> createForCharacterDataMutation(Node* target);
-    static PassOwnPtr<MutationObserverInterestGroup> createForAttributesMutation(Node* target, const QualifiedName& attributeName);
+    static PassOwnPtr<MutationObserverInterestGroup> createForChildListMutation(Node* target)
+    {
+        MutationRecordDeliveryOptions oldValueFlag = 0;
+        return createIfNeeded(target, WebKitMutationObserver::ChildList, nullAtom, oldValueFlag);
+    }
+    static PassOwnPtr<MutationObserverInterestGroup> createForCharacterDataMutation(Node* target)
+    {
+        return createIfNeeded(target, WebKitMutationObserver::CharacterData, nullAtom, WebKitMutationObserver::CharacterDataOldValue);
+    }
+    static PassOwnPtr<MutationObserverInterestGroup> createForAttributesMutation(Node* target, const QualifiedName& attributeName)
+    {
+        return createIfNeeded(target, WebKitMutationObserver::Attributes, attributeName.localName(), WebKitMutationObserver::AttributeOldValue);
+    }
 
     bool isOldValueRequested();
     void enqueueMutationRecord(PassRefPtr<MutationRecord>);
+
 private:
     static PassOwnPtr<MutationObserverInterestGroup> createIfNeeded(Node* target, WebKitMutationObserver::MutationType, const AtomicString& attributeName, MutationRecordDeliveryOptions oldValueFlag);
-    MutationObserverInterestGroup(HashMap<WebKitMutationObserver*, MutationRecordDeliveryOptions> observers, MutationRecordDeliveryOptions oldValueFlag);
+    MutationObserverInterestGroup(HashMap<WebKitMutationObserver*, MutationRecordDeliveryOptions>& observers, MutationRecordDeliveryOptions oldValueFlag);
 
-    inline bool hasOldValue(MutationRecordDeliveryOptions options) { return options & m_oldValueFlag; }
+    bool hasOldValue(MutationRecordDeliveryOptions options) { return options & m_oldValueFlag; }
 
     HashMap<WebKitMutationObserver*, MutationRecordDeliveryOptions> m_observers;