Oilpan: move Node traversal objects to the heap.

Source/core/dom/TreeWalker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
  * Copyright (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 15 matching lines @@
 #include "core/dom/TreeWalker.h"
 
 #include "bindings/v8/ExceptionMessages.h"
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ContainerNode.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NodeTraversal.h"
 
 namespace WebCore {
 
-TreeWalker::TreeWalker(PassRefPtr<Node> rootNode, unsigned whatToShow, PassRefPtr<NodeFilter> filter)
+TreeWalker::TreeWalker(PassRefPtrWillBeRawPtr<Node> rootNode, unsigned whatToShow, PassRefPtrWillBeRawPtr<NodeFilter> filter)
     : NodeIteratorBase(rootNode, whatToShow, filter)
     , m_current(root())
 {
     ScriptWrappable::init(this);
 }
 
-void TreeWalker::setCurrentNode(PassRefPtr<Node> node, ExceptionState& exceptionState)
+void TreeWalker::setCurrentNode(PassRefPtrWillBeRawPtr<Node> node, ExceptionState& exceptionState)
 {
     if (!node) {
         exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::argumentNullOrIncorrectType(1, "Node"));
         return;
     }
     m_current = node;
 }
 
-inline Node* TreeWalker::setCurrent(PassRefPtr<Node> node)
+inline Node* TreeWalker::setCurrent(PassRefPtrWillBeRawPtr<Node> node)
 {
     m_current = node;
     return m_current.get();
 }
 
 Node* TreeWalker::parentNode(ExceptionState& exceptionState)
 {
-    RefPtr<Node> node = m_current;
+    RefPtrWillBeRawPtr<Node> node = m_current;
     while (node != root()) {
         node = node->parentNode();
         if (!node)
             return 0;
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         if (acceptNodeResult == NodeFilter::FILTER_ACCEPT)
             return setCurrent(node.release());
     }
     return 0;
 }
 
 Node* TreeWalker::firstChild(ExceptionState& exceptionState)
 {
-    for (RefPtr<Node> node = m_current->firstChild(); node; ) {
+    for (RefPtrWillBeRawPtr<Node> node = m_current->firstChild(); node; ) {
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         switch (acceptNodeResult) {
             case NodeFilter::FILTER_ACCEPT:
                 m_current = node.release();
                 return m_current.get();
             case NodeFilter::FILTER_SKIP:
                 if (node->firstChild()) {
                     node = node->firstChild();
@@ skipping 12 matching lines @@
             if (!parent || parent == root() || parent == m_current)
                 return 0;
             node = parent;
         } while (node);
     }
     return 0;
 }
 
 Node* TreeWalker::lastChild(ExceptionState& exceptionState)
 {
-    for (RefPtr<Node> node = m_current->lastChild(); node; ) {
+    for (RefPtrWillBeRawPtr<Node> node = m_current->lastChild(); node; ) {
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         switch (acceptNodeResult) {
             case NodeFilter::FILTER_ACCEPT:
                 m_current = node.release();
                 return m_current.get();
             case NodeFilter::FILTER_SKIP:
                 if (node->lastChild()) {
                     node = node->lastChild();
@@ skipping 12 matching lines @@
             if (!parent || parent == root() || parent == m_current)
                 return 0;
             node = parent;
         } while (node);
     }
     return 0;
 }
 
 Node* TreeWalker::previousSibling(ExceptionState& exceptionState)
 {
-    RefPtr<Node> node = m_current;
+    RefPtrWillBeRawPtr<Node> node = m_current;
     if (node == root())
         return 0;
     while (1) {
-        for (RefPtr<Node> sibling = node->previousSibling(); sibling; ) {
+        for (RefPtrWillBeRawPtr<Node> sibling = node->previousSibling(); sibling; ) {
             short acceptNodeResult = acceptNode(sibling.get(), exceptionState);
             if (exceptionState.hadException())
                 return 0;
             switch (acceptNodeResult) {
                 case NodeFilter::FILTER_ACCEPT:
                     m_current = sibling.release();
                     return m_current.get();
                 case NodeFilter::FILTER_SKIP:
                     if (sibling->lastChild()) {
                         sibling = sibling->lastChild();
@@ skipping 12 matching lines @@
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         if (acceptNodeResult == NodeFilter::FILTER_ACCEPT)
             return 0;
     }
 }
 
 Node* TreeWalker::nextSibling(ExceptionState& exceptionState)
 {
-    RefPtr<Node> node = m_current;
+    RefPtrWillBeRawPtr<Node> node = m_current;
     if (node == root())
         return 0;
     while (1) {
-        for (RefPtr<Node> sibling = node->nextSibling(); sibling; ) {
+        for (RefPtrWillBeRawPtr<Node> sibling = node->nextSibling(); sibling; ) {
             short acceptNodeResult = acceptNode(sibling.get(), exceptionState);
             if (exceptionState.hadException())
                 return 0;
             switch (acceptNodeResult) {
                 case NodeFilter::FILTER_ACCEPT:
                     m_current = sibling.release();
                     return m_current.get();
                 case NodeFilter::FILTER_SKIP:
                     if (sibling->firstChild()) {
                         sibling = sibling->firstChild();
@@ skipping 12 matching lines @@
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         if (acceptNodeResult == NodeFilter::FILTER_ACCEPT)
             return 0;
     }
 }
 
 Node* TreeWalker::previousNode(ExceptionState& exceptionState)
 {
-    RefPtr<Node> node = m_current;
+    RefPtrWillBeRawPtr<Node> node = m_current;
     while (node != root()) {
         while (Node* previousSibling = node->previousSibling()) {
             node = previousSibling;
             short acceptNodeResult = acceptNode(node.get(), exceptionState);
             if (exceptionState.hadException())
                 return 0;
             if (acceptNodeResult == NodeFilter::FILTER_REJECT)
                 continue;
             while (Node* lastChild = node->lastChild()) {
                 node = lastChild;
@@ skipping 18 matching lines @@
         if (exceptionState.hadException())
             return 0;
         if (acceptNodeResult == NodeFilter::FILTER_ACCEPT)
             return setCurrent(node.release());
     }
     return 0;
 }
 
 Node* TreeWalker::nextNode(ExceptionState& exceptionState)
 {
-    RefPtr<Node> node = m_current;
+    RefPtrWillBeRawPtr<Node> node = m_current;
 Children:
     while (Node* firstChild = node->firstChild()) {
         node = firstChild;
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         if (acceptNodeResult == NodeFilter::FILTER_ACCEPT)
             return setCurrent(node.release());
         if (acceptNodeResult == NodeFilter::FILTER_REJECT)
             break;
     }
     while (Node* nextSibling = NodeTraversal::nextSkippingChildren(*node, root())) {
         node = nextSibling;
         short acceptNodeResult = acceptNode(node.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
         if (acceptNodeResult == NodeFilter::FILTER_ACCEPT)
             return setCurrent(node.release());
         if (acceptNodeResult == NodeFilter::FILTER_SKIP)
             goto Children;
     }
     return 0;
 }
 
+void TreeWalker::trace(Visitor* visitor)
+{
+    visitor->trace(m_current);
+    NodeIteratorBase::trace(visitor);
+}
+
 } // namespace WebCore