Merge 121003

Source/WebCore/dom/DynamicNodeList.cpp

Index: Source/WebCore/dom/DynamicNodeList.cpp
===================================================================
--- Source/WebCore/dom/DynamicNodeList.cpp	(revision 122247)
+++ Source/WebCore/dom/DynamicNodeList.cpp	(working copy)
@@ -38,7 +38,7 @@
         return m_caches.cachedLength;
 
     unsigned length = 0;
-    Node* rootNode = node();
+    Node* rootNode = this->rootNode();
 
     for (Node* n = rootNode->firstChild(); n; n = n->traverseNextNode(rootNode))
         length += n->isElementNode() && nodeMatches(static_cast<Element*>(n));
@@ -52,7 +52,7 @@
 Node* DynamicSubtreeNodeList::itemForwardsFromCurrent(Node* start, unsigned offset, int remainingOffset) const
 {
     ASSERT(remainingOffset >= 0);
-    Node* rootNode = node();
+    Node* rootNode = this->rootNode();
     for (Node* n = start; n; n = n->traverseNextNode(rootNode)) {
         if (n->isElementNode() && nodeMatches(static_cast<Element*>(n))) {
             if (!remainingOffset) {
@@ -71,7 +71,7 @@
 Node* DynamicSubtreeNodeList::itemBackwardsFromCurrent(Node* start, unsigned offset, int remainingOffset) const
 {
     ASSERT(remainingOffset < 0);
-    Node* rootNode = node();
+    Node* rootNode = this->rootNode();
     for (Node* n = start; n; n = n->traversePreviousNode(rootNode)) {
         if (n->isElementNode() && nodeMatches(static_cast<Element*>(n))) {
             if (!remainingOffset) {
@@ -90,7 +90,7 @@
 Node* DynamicSubtreeNodeList::item(unsigned offset) const
 {
     int remainingOffset = offset;
-    Node* start = node()->firstChild();
+    Node* start = rootNode()->firstChild();
     if (m_caches.isItemCacheValid) {
         if (offset == m_caches.lastItemOffset)
             return m_caches.lastItem;
@@ -107,7 +107,7 @@
 
 Node* DynamicNodeList::itemWithName(const AtomicString& elementId) const
 {
-    Node* rootNode = node();
+    Node* rootNode = this->rootNode();
 
     if (rootNode->inDocument()) {
         Element* element = rootNode->treeScope()->getElementById(elementId);