Oilpan: move Node traversal objects to the heap.

Source/core/dom/NodeIterator.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 11 matching lines @@
  *
  */
 
 #include "config.h"
 #include "core/dom/NodeIterator.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NodeTraversal.h"
-#include "core/frame/UseCounter.h"
 
 namespace WebCore {
 
 NodeIterator::NodePointer::NodePointer()
 {
 }
 
-NodeIterator::NodePointer::NodePointer(PassRefPtr<Node> n, bool b)
+NodeIterator::NodePointer::NodePointer(PassRefPtrWillBeRawPtr<Node> n, bool b)
     : node(n)
     , isPointerBeforeNode(b)
 {
 }
 
 void NodeIterator::NodePointer::clear()
 {
     node.clear();
 }
 
@@ skipping 14 matching lines @@
     if (!node)
         return false;
     if (!isPointerBeforeNode) {
         isPointerBeforeNode = true;
         return true;
     }
     node = NodeTraversal::previous(*node, root);
     return node;
 }
 
-NodeIterator::NodeIterator(PassRefPtr<Node> rootNode, unsigned whatToShow, PassRefPtr<NodeFilter> filter)
+NodeIterator::NodeIterator(PassRefPtrWillBeRawPtr<Node> rootNode, unsigned whatToShow, PassRefPtrWillBeRawPtr<NodeFilter> filter)
     : NodeIteratorBase(rootNode, whatToShow, filter)
     , m_referenceNode(root(), true)
 {
     ScriptWrappable::init(this);
     root()->document().attachNodeIterator(this);
 }
 
 NodeIterator::~NodeIterator()
 {
+#if !ENABLE(OILPAN)
     root()->document().detachNodeIterator(this);
+#endif
 }
 
-PassRefPtr<Node> NodeIterator::nextNode(ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<Node> NodeIterator::nextNode(ExceptionState& exceptionState)
 {
-    RefPtr<Node> result;
+    RefPtrWillBeRawPtr<Node> result = nullptr;
 
     m_candidateNode = m_referenceNode;
     while (m_candidateNode.moveToNext(root())) {
         // NodeIterators treat the DOM tree as a flat list of nodes.
         // In other words, FILTER_REJECT does not pass over descendants
         // of the rejected node. Hence, FILTER_REJECT is the same as FILTER_SKIP.
-        RefPtr<Node> provisionalResult = m_candidateNode.node;
+        RefPtrWillBeRawPtr<Node> provisionalResult = m_candidateNode.node;
         bool nodeWasAccepted = acceptNode(provisionalResult.get(), exceptionState) == NodeFilter::FILTER_ACCEPT;
         if (exceptionState.hadException())
             break;
         if (nodeWasAccepted) {
             m_referenceNode = m_candidateNode;
             result = provisionalResult.release();
             break;
         }
     }
 
     m_candidateNode.clear();
     return result.release();
 }
 
-PassRefPtr<Node> NodeIterator::previousNode(ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<Node> NodeIterator::previousNode(ExceptionState& exceptionState)
 {
-    RefPtr<Node> result;
+    RefPtrWillBeRawPtr<Node> result = nullptr;
 
     m_candidateNode = m_referenceNode;
     while (m_candidateNode.moveToPrevious(root())) {
         // NodeIterators treat the DOM tree as a flat list of nodes.
         // In other words, FILTER_REJECT does not pass over descendants
         // of the rejected node. Hence, FILTER_REJECT is the same as FILTER_SKIP.
-        RefPtr<Node> provisionalResult = m_candidateNode.node;
+        RefPtrWillBeRawPtr<Node> provisionalResult = m_candidateNode.node;
         bool nodeWasAccepted = acceptNode(provisionalResult.get(), exceptionState) == NodeFilter::FILTER_ACCEPT;
         if (exceptionState.hadException())
             break;
         if (nodeWasAccepted) {
             m_referenceNode = m_candidateNode;
             result = provisionalResult.release();
             break;
         }
     }
 
@@ skipping 13 matching lines @@
 }
 
 void NodeIterator::updateForNodeRemoval(Node& removedNode, NodePointer& referenceNode) const
 {
     ASSERT(root()->document() == removedNode.document());
 
     // Iterator is not affected if the removed node is the reference node and is the root.
     // or if removed node is not the reference node, or the ancestor of the reference node.
     if (!removedNode.isDescendantOf(root()))
         return;
-    bool willRemoveReferenceNode = removedNode == referenceNode.node;
+    bool willRemoveReferenceNode = removedNode == referenceNode.node.get();
     bool willRemoveReferenceNodeAncestor = referenceNode.node && referenceNode.node->isDescendantOf(&removedNode);
     if (!willRemoveReferenceNode && !willRemoveReferenceNodeAncestor)
         return;
 
     if (referenceNode.isPointerBeforeNode) {
         Node* node = NodeTraversal::next(removedNode, root());
         if (node) {
             // Move out from under the node being removed if the new reference
             // node is a descendant of the node being removed.
             while (node && node->isDescendantOf(&removedNode))
@@ skipping 37 matching lines @@
             if (willRemoveReferenceNodeAncestor) {
                 while (node && node->isDescendantOf(&removedNode))
                     node = NodeTraversal::previous(*node, root());
             }
             if (node)
                 referenceNode.node = node;
         }
     }
 }
 
+void NodeIterator::trace(Visitor* visitor)
+{
+    visitor->trace(m_referenceNode);
+    visitor->trace(m_candidateNode);
+    NodeIteratorBase::trace(visitor);
+}
 
 } // namespace WebCore