Changeset 85650 in webkit

Timestamp:

May 3, 2011 1:35:39 PM (13 years ago)

Author:

rolandsteiner@chromium.org

Message:

2011-05-03 Roland Steiner <​rolandsteiner@chromium.org>

Reviewed by Dimitri Glazkov.

Update node list cache count on the containing TreeScope rather than the Document
​https://bugs.webkit.org/show_bug.cgi?id=59983

Change code to call add/removeNodeListCache() and hasNodeListCaches() on the proper tree scope.
Move updating of the node list cache count from setDocument() to setTreeScopeRecursively().
Make setDocument() and setDocumentRecursively() private.

No new tests. (refactoring)

• dom/ContainerNode.cpp: (WebCore::ContainerNode::childrenChanged):
• dom/Node.cpp: (WebCore::Node::~Node): (WebCore::Node::setDocument): (WebCore::Node::setTreeScopeRecursively): (WebCore::Node::childNodes): (WebCore::Node::registerDynamicNodeList): (WebCore::Node::unregisterDynamicNodeList): (WebCore::Node::notifyLocalNodeListsAttributeChanged): (WebCore::Node::notifyLocalNodeListsChildrenChanged): (WebCore::Node::getElementsByTagName): (WebCore::Node::getElementsByTagNameNS): (WebCore::Node::getElementsByName): (WebCore::Node::getElementsByClassName):
• dom/Node.h:
• html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElement::labels):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/Node.cpp (modified) (12 diffs)
• dom/Node.h (modified) (2 diffs)
• html/HTMLFormControlElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-03  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Update node list cache count on the containing TreeScope rather than the Document
+        https://bugs.webkit.org/show_bug.cgi?id=59983
+
+        Change code to call add/removeNodeListCache() and hasNodeListCaches() on the proper tree scope.
+        Move updating of the node list cache count from setDocument() to setTreeScopeRecursively().
+        Make setDocument() and setDocumentRecursively() private.
+
+        No new tests. (refactoring)
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::childrenChanged):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        (WebCore::Node::setDocument):
+        (WebCore::Node::setTreeScopeRecursively):
+        (WebCore::Node::childNodes):
+        (WebCore::Node::registerDynamicNodeList):
+        (WebCore::Node::unregisterDynamicNodeList):
+        (WebCore::Node::notifyLocalNodeListsAttributeChanged):
+        (WebCore::Node::notifyLocalNodeListsChildrenChanged):
+        (WebCore::Node::getElementsByTagName):
+        (WebCore::Node::getElementsByTagNameNS):
+        (WebCore::Node::getElementsByName):
+        (WebCore::Node::getElementsByClassName):
+        * dom/Node.h:
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::labels):
+
 2011-05-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -794 +794 @@
     if (!changedByParser && childCountDelta)
         document()->nodeChildrenChanged(this);
-    if (document()->hasNodeListCaches())
+    if (treeScope()->hasNodeListCaches())
         notifyNodeListsChildrenChanged();
 }

trunk/Source/WebCore/dom/Node.cpp

@@ -389 +389 @@
         ASSERT(!NodeRareData::rareDataMap().contains(this));
     else {
-        if (m_document && rareData()->nodeLists())
-            m_document->removeNodeListCache();
+        if (treeScope() && rareData()->nodeLists())
+            treeScope()->removeNodeListCache();
         
         NodeRareData::NodeRareDataMap& dataMap = NodeRareData::rareDataMap();
@@ -452 +452 @@
     willMoveToNewOwnerDocument();
     ASSERT(willMoveToNewOwnerDocumentWasCalled);
-
-    if (hasRareData() && rareData()->nodeLists()) {
-        if (m_document)
-            m_document->removeNodeListCache();
-        document->addNodeListCache();
-    }
 
     if (m_document) {
@@ -509 +503 @@
             node->ensureRareData()->setTreeScope(newTreeScope);
 
+        if (hasRareData() && rareData()->nodeLists()) {
+            if (currentTreeScope)
+                currentTreeScope->removeNodeListCache();
+            newTreeScope->addNodeListCache();
+        }
+
         node->setDocument(newDocument);
 
@@ -605 +605 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        if (document())
-            document()->addNodeListCache();
+        if (treeScope())
+            treeScope()->addNodeListCache();
     }
 
@@ -977 +977 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        document()->addNodeListCache();
-    } else if (!m_document || !m_document->hasNodeListCaches()) {
+        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.
         data->nodeLists()->invalidateCaches();
@@ -996 +996 @@
         if (data->nodeLists()->isEmpty()) {
             data->clearNodeLists();
-            if (document())
-                document()->removeNodeListCache();
+            if (treeScope())
+                treeScope()->removeNodeListCache();
         }
     }
@@ -1017 +1017 @@
     if (data->nodeLists()->isEmpty()) {
         data->clearNodeLists();
-        document()->removeNodeListCache();
+        treeScope()->removeNodeListCache();
     }
 }
@@ -1043 +1043 @@
     if (data->nodeLists()->isEmpty()) {
         data->clearNodeLists();
-        document()->removeNodeListCache();
+        treeScope()->removeNodeListCache();
     }
 }
@@ -1773 +1773 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        document()->addNodeListCache();
+        treeScope()->addNodeListCache();
     }
 
@@ -1802 +1802 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        document()->addNodeListCache();
+        treeScope()->addNodeListCache();
     }
 
@@ -1825 +1825 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        document()->addNodeListCache();
+        treeScope()->addNodeListCache();
     }
 
@@ -1842 +1842 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        document()->addNodeListCache();
+        treeScope()->addNodeListCache();
     }
 

trunk/Source/WebCore/dom/Node.h

@@ -632 +632 @@
     Node(Document*, ConstructionType);
 
-    // Do not use this method to change the document of a node until after the node has been
-    // removed from its previous document.
-    void setDocument(Document*);
-    void setDocumentRecursively(Document*);
-
     virtual void willMoveToNewOwnerDocument();
     virtual void didMoveToNewOwnerDocument();
@@ -650 +645 @@
 
 private:
+    // Do not use this method to change the document of a node until after the node has been
+    // removed from its previous document.
+    void setDocumentRecursively(Document*);
+    void setDocument(Document*);
+
     enum EditableLevel { Editable, RichlyEditable };
     bool rendererIsEditable(EditableLevel) const;

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -469 +469 @@
     if (!data->nodeLists()) {
         data->setNodeLists(NodeListsNodeData::create());
-        document()->addNodeListCache();
+        treeScope()->addNodeListCache();
     }