Changeset 102208 in webkit

Timestamp:

Dec 6, 2011 7:17:05 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

The code to create a NodeListsNodeData is duplicated everywhere
​https://bugs.webkit.org/show_bug.cgi?id=73961

Reviewed by Darin Adler.

Extracted the logic to create NodeListsNodeData as NodeRareData::ensureNodeLists.

• dom/Document.cpp:

(WebCore::Document::getItems):

• dom/Node.cpp:

(WebCore::Node::childNodes):
(WebCore::Node::registerDynamicNodeList):
(WebCore::Node::getElementsByTagName):
(WebCore::Node::getElementsByTagNameNS):
(WebCore::Node::getElementsByName):
(WebCore::Node::getElementsByClassName):

• dom/NodeRareData.h:

(WebCore::NodeRareData::ensureNodeLists):

• html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::labels):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Node.cpp (modified) (9 diffs)
• dom/NodeRareData.h (modified) (2 diffs)
• html/HTMLFormControlElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        The code to create a NodeListsNodeData is duplicated everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=73961
+
+        Reviewed by Darin Adler.
+
+        Extracted the logic to create NodeListsNodeData as NodeRareData::ensureNodeLists.
+
+        * dom/Document.cpp:
+        (WebCore::Document::getItems):
+        * dom/Node.cpp:
+        (WebCore::Node::childNodes):
+        (WebCore::Node::registerDynamicNodeList):
+        (WebCore::Node::getElementsByTagName):
+        (WebCore::Node::getElementsByTagNameNS):
+        (WebCore::Node::getElementsByName):
+        (WebCore::Node::getElementsByClassName):
+        * dom/NodeRareData.h:
+        (WebCore::NodeRareData::ensureNodeLists):
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::labels):
+
 2011-12-06  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5157 +5157 @@
 PassRefPtr<NodeList> Document::getItems(const String& typeNames)
 {
-    NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
+    NodeListsNodeData* nodeLists = ensureRareData()->ensureNodeLists();
 
     // Since documet.getItem() is allowed for microdata, typeNames will be null string.
@@ -5167 +5163 @@
     String localTypeNames = typeNames.isNull() ? String("http://webkit.org/microdata/undefinedItemType") : typeNames;
 
-    pair<NodeListsNodeData::MicroDataItemListCache::iterator, bool> result = data->nodeLists()->m_microDataItemListCache.add(localTypeNames, 0);
+    pair<NodeListsNodeData::MicroDataItemListCache::iterator, bool> result = nodeLists->m_microDataItemListCache.add(localTypeNames, 0);
     if (!result.second)
         return PassRefPtr<NodeList>(result.first->second);

trunk/Source/WebCore/dom/Node.cpp

@@ -624 +624 @@
 PassRefPtr<NodeList> Node::childNodes()
 {
-    NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        if (treeScope())
-            treeScope()->addNodeListCache();
-    }
-
-    if (!data->nodeLists()->m_childNodeListCaches)
-        data->nodeLists()->m_childNodeListCaches = DynamicNodeList::Caches::create();
-    return ChildNodeList::create(this, data->nodeLists()->m_childNodeListCaches.get());
+    NodeListsNodeData* nodeLists = ensureRareData()->ensureNodeLists(this);
+    if (!nodeLists->m_childNodeListCaches)
+        nodeLists->m_childNodeListCaches = DynamicNodeList::Caches::create();
+    return ChildNodeList::create(this, nodeLists->m_childNodeListCaches.get());
 }
 
@@ -1006 +1000 @@
 {
     NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    } else if (!treeScope() || !treeScope()->hasNodeListCaches()) {
-        // We haven't been receiving notifications while there were no registered lists, so the cache is invalid now.
+    // We haven't been receiving notifications while there were no registered lists, so the cache is invalid now.
+    if (data->nodeLists() && (!treeScope() || !treeScope()->hasNodeListCaches()))
         data->nodeLists()->invalidateCaches();
-    }
 
     if (list->hasOwnCaches())
-        data->nodeLists()->m_listsWithCaches.add(list);
+        data->ensureNodeLists(this)->m_listsWithCaches.add(list);
 }
 
@@ -1668 +1658 @@
         return 0;
 
-    NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
-
     String name = localName;
     if (document()->isHTMLDocument())
@@ -1680 +1664 @@
     AtomicString localNameAtom = name;
 
-    pair<NodeListsNodeData::TagNodeListCache::iterator, bool> result = data->nodeLists()->m_tagNodeListCache.add(localNameAtom, 0);
+    pair<NodeListsNodeData::TagNodeListCache::iterator, bool> result = ensureRareData()->ensureNodeLists(this)->m_tagNodeListCache.add(localNameAtom, 0);
     if (!result.second)
         return PassRefPtr<TagNodeList>(result.first->second);
@@ -1697 +1681 @@
         return getElementsByTagName(localName);
 
-    NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
-
     String name = localName;
     if (document()->isHTMLDocument())
@@ -1709 +1687 @@
     AtomicString localNameAtom = name;
 
-    pair<NodeListsNodeData::TagNodeListCacheNS::iterator, bool> result = data->nodeLists()->m_tagNodeListCacheNS.add(QualifiedName(nullAtom, localNameAtom, namespaceURI).impl(), 0);
+    pair<NodeListsNodeData::TagNodeListCacheNS::iterator, bool> result
+        = ensureRareData()->ensureNodeLists(this)->m_tagNodeListCacheNS.add(QualifiedName(nullAtom, localNameAtom, namespaceURI).impl(), 0);
     if (!result.second)
         return PassRefPtr<TagNodeList>(result.first->second);
@@ -1720 +1699 @@
 PassRefPtr<NodeList> Node::getElementsByName(const String& elementName)
 {
-    NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
-
-    pair<NodeListsNodeData::NameNodeListCache::iterator, bool> result = data->nodeLists()->m_nameNodeListCache.add(elementName, 0);
+    pair<NodeListsNodeData::NameNodeListCache::iterator, bool> result = ensureRareData()->ensureNodeLists(this)->m_nameNodeListCache.add(elementName, 0);
     if (!result.second)
         return PassRefPtr<NodeList>(result.first->second);
@@ -1737 +1710 @@
 PassRefPtr<NodeList> Node::getElementsByClassName(const String& classNames)
 {
-    NodeRareData* data = ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
-
-    pair<NodeListsNodeData::ClassNodeListCache::iterator, bool> result = data->nodeLists()->m_classNodeListCache.add(classNames, 0);
+    pair<NodeListsNodeData::ClassNodeListCache::iterator, bool> result
+        = ensureRareData()->ensureNodeLists(this)->m_classNodeListCache.add(classNames, 0);
     if (!result.second)
         return PassRefPtr<NodeList>(result.first->second);
@@ -3041 +3009 @@
 #endif
 
+void NodeRareData::createNodeLists(Node* node)
+{
+    ASSERT(node);
+    setNodeLists(NodeListsNodeData::create());
+    if (TreeScope* treeScope = node->treeScope())
+        treeScope->addNodeListCache();
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/NodeRareData.h

@@ -127 +127 @@
     void setNodeLists(PassOwnPtr<NodeListsNodeData> lists) { m_nodeLists = lists; }
     NodeListsNodeData* nodeLists() const { return m_nodeLists.get(); }
+    NodeListsNodeData* ensureNodeLists(Node* node)
+    {
+        if (!m_nodeLists)
+            createNodeLists(node);
+        return m_nodeLists.get();
+    }
 
     short tabIndex() const { return m_tabIndex; }
@@ -226 +232 @@
 
 private:
+    void createNodeLists(Node*);
+
     TreeScope* m_treeScope;
     OwnPtr<NodeListsNodeData> m_nodeLists;

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -493 +493 @@
         return 0;
 
-    NodeRareData* data = Node::ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
-
-    if (data->nodeLists()->m_labelsNodeListCache)
-        return data->nodeLists()->m_labelsNodeListCache;
+    NodeListsNodeData* nodeLists = Node::ensureRareData()->ensureNodeLists(this);
+    if (nodeLists->m_labelsNodeListCache)
+        return nodeLists->m_labelsNodeListCache;
 
     RefPtr<LabelsNodeList> list = LabelsNodeList::create(this);
-    data->nodeLists()->m_labelsNodeListCache = list.get();
+    nodeLists->m_labelsNodeListCache = list.get();
     return list.release();
 }