Changeset 166461 in webkit

Timestamp:

Mar 30, 2014 3:48:32 AM (10 years ago)

Author:

akling@apple.com

Message:

Make NodeList and HTMLCollection caching helpers use PassRef.
<​https://webkit.org/b/130943>

Tweak the helpers in NodeListsNodeData to return PassRef instead of
PassRefPtr. This knocks 2 branches off of some pretty hot code on
Dromaeo/dom-query.

Reviewed by Antti Koivisto.

• dom/ChildNodeList.h:
• dom/ClassNodeList.h:
• dom/NameNodeList.h:
• dom/NodeRareData.h:

(WebCore::NodeListsNodeData::ensureChildNodeList):
(WebCore::NodeListsNodeData::ensureEmptyChildNodeList):
(WebCore::NodeListsNodeData::addCacheWithAtomicName):
(WebCore::NodeListsNodeData::addCacheWithName):
(WebCore::NodeListsNodeData::addCacheWithQualifiedName):
(WebCore::NodeListsNodeData::addCachedCollection):

• dom/TagNodeList.h:
• html/HTMLCollection.cpp:

(WebCore::HTMLCollection::create):

• html/HTMLCollection.h:
• html/HTMLFormControlsCollection.cpp:

(WebCore::HTMLFormControlsCollection::create):

• html/HTMLFormControlsCollection.h:
• html/RadioNodeList.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ChildNodeList.h (modified) (2 diffs)
• dom/ClassNodeList.h (modified) (1 diff)
• dom/NameNodeList.h (modified) (1 diff)
• dom/NodeRareData.h (modified) (3 diffs)
• dom/TagNodeList.h (modified) (2 diffs)
• html/HTMLCollection.cpp (modified) (1 diff)
• html/HTMLCollection.h (modified) (1 diff)
• html/HTMLFormControlsCollection.cpp (modified) (1 diff)
• html/HTMLFormControlsCollection.h (modified) (1 diff)
• html/RadioNodeList.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-30  Andreas Kling  <akling@apple.com>
+
+        Make NodeList and HTMLCollection caching helpers use PassRef.
+        <https://webkit.org/b/130943>
+
+        Tweak the helpers in NodeListsNodeData to return PassRef instead of
+        PassRefPtr. This knocks 2 branches off of some pretty hot code on
+        Dromaeo/dom-query.
+
+        Reviewed by Antti Koivisto.
+
+        * dom/ChildNodeList.h:
+        * dom/ClassNodeList.h:
+        * dom/NameNodeList.h:
+        * dom/NodeRareData.h:
+        (WebCore::NodeListsNodeData::ensureChildNodeList):
+        (WebCore::NodeListsNodeData::ensureEmptyChildNodeList):
+        (WebCore::NodeListsNodeData::addCacheWithAtomicName):
+        (WebCore::NodeListsNodeData::addCacheWithName):
+        (WebCore::NodeListsNodeData::addCacheWithQualifiedName):
+        (WebCore::NodeListsNodeData::addCachedCollection):
+        * dom/TagNodeList.h:
+        * html/HTMLCollection.cpp:
+        (WebCore::HTMLCollection::create):
+        * html/HTMLCollection.h:
+        * html/HTMLFormControlsCollection.cpp:
+        (WebCore::HTMLFormControlsCollection::create):
+        * html/HTMLFormControlsCollection.h:
+        * html/RadioNodeList.h:
+
 2014-03-29  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/ChildNodeList.h

@@ -36 +36 @@
 class EmptyNodeList final : public NodeList {
 public:
-    static PassRefPtr<EmptyNodeList> create(Node& owner)
+    static PassRef<EmptyNodeList> create(Node& owner)
     {
-        return adoptRef(new EmptyNodeList(owner));
+        return adoptRef(*new EmptyNodeList(owner));
     }
     virtual ~EmptyNodeList();
@@ -59 +59 @@
 class ChildNodeList final : public NodeList {
 public:
-    static PassRefPtr<ChildNodeList> create(ContainerNode& parent)
+    static PassRef<ChildNodeList> create(ContainerNode& parent)
     {
-        return adoptRef(new ChildNodeList(parent));
+        return adoptRef(*new ChildNodeList(parent));
     }
 

trunk/Source/WebCore/dom/ClassNodeList.h

@@ -40 +40 @@
 class ClassNodeList final : public CachedLiveNodeList<ClassNodeList> {
 public:
-    static PassRefPtr<ClassNodeList> create(ContainerNode& rootNode, const String& classNames)
+    static PassRef<ClassNodeList> create(ContainerNode& rootNode, const String& classNames)
     {
-        return adoptRef(new ClassNodeList(rootNode, classNames));
+        return adoptRef(*new ClassNodeList(rootNode, classNames));
     }
 

trunk/Source/WebCore/dom/NameNodeList.h

@@ -34 +34 @@
 class NameNodeList final : public CachedLiveNodeList<NameNodeList> {
 public:
-    static PassRefPtr<NameNodeList> create(ContainerNode& rootNode, const AtomicString& name)
+    static PassRef<NameNodeList> create(ContainerNode& rootNode, const AtomicString& name)
     {
-        return adoptRef(new NameNodeList(rootNode, name));
+        return adoptRef(*new NameNodeList(rootNode, name));
     }
 

trunk/Source/WebCore/dom/NodeRareData.h

@@ -67 +67 @@
     }
 
-    PassRefPtr<ChildNodeList> ensureChildNodeList(ContainerNode& node)
+    PassRef<ChildNodeList> ensureChildNodeList(ContainerNode& node)
     {
         ASSERT(!m_emptyChildNodeList);
         if (m_childNodeList)
-            return m_childNodeList;
-        RefPtr<ChildNodeList> list = ChildNodeList::create(node);
-        m_childNodeList = list.get();
-        return list.release();
+            return *m_childNodeList;
+        auto list = ChildNodeList::create(node);
+        m_childNodeList = &list.get();
+        return list;
     }
 
@@ -85 +85 @@
     }
 
-    PassRefPtr<EmptyNodeList> ensureEmptyChildNodeList(Node& node)
+    PassRef<EmptyNodeList> ensureEmptyChildNodeList(Node& node)
     {
         ASSERT(!m_childNodeList);
         if (m_emptyChildNodeList)
-            return m_emptyChildNodeList;
-        RefPtr<EmptyNodeList> list = EmptyNodeList::create(node);
-        m_emptyChildNodeList = list.get();
-        return list.release();
+            return *m_emptyChildNodeList;
+        auto list = EmptyNodeList::create(node);
+        m_emptyChildNodeList = &list.get();
+        return list;
     }
 
@@ -119 +119 @@
 
     template<typename T, typename ContainerType>
-    PassRefPtr<T> addCacheWithAtomicName(ContainerType& container, const AtomicString& name)
+    PassRef<T> addCacheWithAtomicName(ContainerType& container, const AtomicString& name)
     {
         NodeListAtomicNameCacheMap::AddResult result = m_atomicNameCaches.add(namedNodeListKey<T>(name), nullptr);
         if (!result.isNewEntry)
-            return static_cast<T*>(result.iterator->value);
-
-        RefPtr<T> list = T::create(container, name);
-        result.iterator->value = list.get();
-        return list.release();
+            return static_cast<T&>(*result.iterator->value);
+
+        auto list = T::create(container, name);
+        result.iterator->value = &list.get();
+        return list;
     }
 
     template<typename T>
-    PassRefPtr<T> addCacheWithName(ContainerNode& node, const String& name)
+    PassRef<T> addCacheWithName(ContainerNode& node, const String& name)
     {
         NodeListNameCacheMap::AddResult result = m_nameCaches.add(namedNodeListKey<T>(name), nullptr);
         if (!result.isNewEntry)
-            return static_cast<T*>(result.iterator->value);
-
-        RefPtr<T> list = T::create(node, name);
-        result.iterator->value = list.get();
-        return list.release();
-    }
-
-    PassRefPtr<TagNodeList> addCacheWithQualifiedName(ContainerNode& node, const AtomicString& namespaceURI, const AtomicString& localName)
+            return static_cast<T&>(*result.iterator->value);
+
+        auto list = T::create(node, name);
+        result.iterator->value = &list.get();
+        return list;
+    }
+
+    PassRef<TagNodeList> addCacheWithQualifiedName(ContainerNode& node, const AtomicString& namespaceURI, const AtomicString& localName)
     {
         QualifiedName name(nullAtom, localName, namespaceURI);
         TagNodeListCacheNS::AddResult result = m_tagNodeListCacheNS.add(name, nullptr);
         if (!result.isNewEntry)
-            return result.iterator->value;
-
-        RefPtr<TagNodeList> list = TagNodeList::create(node, namespaceURI, localName);
-        result.iterator->value = list.get();
-        return list.release();
+            return *result.iterator->value;
+
+        auto list = TagNodeList::create(node, namespaceURI, localName);
+        result.iterator->value = &list.get();
+        return list;
     }
 
     template<typename T, typename ContainerType>
-    PassRefPtr<T> addCachedCollection(ContainerType& container, CollectionType collectionType, const AtomicString& name)
+    PassRef<T> addCachedCollection(ContainerType& container, CollectionType collectionType, const AtomicString& name)
     {
         CollectionCacheMap::AddResult result = m_cachedCollections.add(namedCollectionKey(collectionType, name), nullptr);
         if (!result.isNewEntry)
-            return static_cast<T*>(result.iterator->value);
-
-        RefPtr<T> list = T::create(container, collectionType, name);
-        result.iterator->value = list.get();
-        return list.release();
+            return static_cast<T&>(*result.iterator->value);
+
+        auto list = T::create(container, collectionType, name);
+        result.iterator->value = &list.get();
+        return list;
     }
 
     template<typename T, typename ContainerType>
-    PassRefPtr<T> addCachedCollection(ContainerType& container, CollectionType collectionType)
+    PassRef<T> addCachedCollection(ContainerType& container, CollectionType collectionType)
     {
         CollectionCacheMap::AddResult result = m_cachedCollections.add(namedCollectionKey(collectionType, starAtom), nullptr);
         if (!result.isNewEntry)
-            return static_cast<T*>(result.iterator->value);
-
-        RefPtr<T> list = T::create(container, collectionType);
-        result.iterator->value = list.get();
-        return list.release();
+            return static_cast<T&>(*result.iterator->value);
+
+        auto list = T::create(container, collectionType);
+        result.iterator->value = &list.get();
+        return list;
     }
 

trunk/Source/WebCore/dom/TagNodeList.h

@@ -34 +34 @@
 class TagNodeList final : public CachedLiveNodeList<TagNodeList> {
 public:
-    static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
+    static PassRef<TagNodeList> create(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
     {
         ASSERT(namespaceURI != starAtom);
-        return adoptRef(new TagNodeList(rootNode, namespaceURI, localName));
+        return adoptRef(*new TagNodeList(rootNode, namespaceURI, localName));
     }
 
-    static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, const AtomicString& localName)
+    static PassRef<TagNodeList> create(ContainerNode& rootNode, const AtomicString& localName)
     {
-        return adoptRef(new TagNodeList(rootNode, starAtom, localName));
+        return adoptRef(*new TagNodeList(rootNode, starAtom, localName));
     }
 
@@ -68 +68 @@
 class HTMLTagNodeList final : public CachedLiveNodeList<HTMLTagNodeList> {
 public:
-    static PassRefPtr<HTMLTagNodeList> create(ContainerNode& rootNode, const AtomicString& localName)
+    static PassRef<HTMLTagNodeList> create(ContainerNode& rootNode, const AtomicString& localName)
     {
-        return adoptRef(new HTMLTagNodeList(rootNode, localName));
+        return adoptRef(*new HTMLTagNodeList(rootNode, localName));
     }
 

trunk/Source/WebCore/html/HTMLCollection.cpp

@@ -146 +146 @@
 }
 
-PassRefPtr<HTMLCollection> HTMLCollection::create(ContainerNode& base, CollectionType type)
-{
-    return adoptRef(new HTMLCollection(base, type));
+PassRef<HTMLCollection> HTMLCollection::create(ContainerNode& base, CollectionType type)
+{
+    return adoptRef(*new HTMLCollection(base, type));
 }
 

trunk/Source/WebCore/html/HTMLCollection.h

@@ -87 +87 @@
 class HTMLCollection : public ScriptWrappable, public RefCounted<HTMLCollection> {
 public:
-    static PassRefPtr<HTMLCollection> create(ContainerNode& base, CollectionType);
+    static PassRef<HTMLCollection> create(ContainerNode& base, CollectionType);
     virtual ~HTMLCollection();
 

trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp

@@ -44 +44 @@
 }
 
-PassRefPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType)
+PassRef<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType)
 {
-    return adoptRef(new HTMLFormControlsCollection(ownerNode));
+    return adoptRef(*new HTMLFormControlsCollection(ownerNode));
 }
 

trunk/Source/WebCore/html/HTMLFormControlsCollection.h

@@ -38 +38 @@
 class HTMLFormControlsCollection : public HTMLCollection {
 public:
-    static PassRefPtr<HTMLFormControlsCollection> create(ContainerNode&, CollectionType);
+    static PassRef<HTMLFormControlsCollection> create(ContainerNode&, CollectionType);
 
     virtual ~HTMLFormControlsCollection();

trunk/Source/WebCore/html/RadioNodeList.h

@@ -36 +36 @@
 class RadioNodeList final : public CachedLiveNodeList<RadioNodeList> {
 public:
-    static PassRefPtr<RadioNodeList> create(ContainerNode& rootNode, const AtomicString& name)
+    static PassRef<RadioNodeList> create(ContainerNode& rootNode, const AtomicString& name)
     {
-        return adoptRef(new RadioNodeList(rootNode, name));
+        return adoptRef(*new RadioNodeList(rootNode, name));
     }