Merge 137739

Source/WebCore/dom/ContainerNode.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 323 matching lines @@
         m_nextSnapshot = latestSnapshot;
         latestSnapshot = this;
     }
 
     ~ChildNodesLazySnapshot()
     {
         latestSnapshot = m_nextSnapshot;
     }
 
     // Returns 0 if there is no next Node.
-    Node* nextNode()
+    PassRefPtr<Node> nextNode()
     {
         if (LIKELY(!hasSnapshot())) {
-            Node* node = m_currentNode.get();
-            if (m_currentNode)
-                m_currentNode = m_currentNode->nextSibling();
+            RefPtr<Node> node = m_currentNode;
+            if (node.get())
+                m_currentNode = node->nextSibling();
             return node;
         }
         Vector<RefPtr<Node> >* nodeVector = m_childNodes.get();
         if (m_currentIndex >= nodeVector->size())
             return 0;
-        return (*nodeVector)[m_currentIndex++].get();
+        return (*nodeVector)[m_currentIndex++];
     }
 
     void takeSnapshot()
     {
         if (hasSnapshot())
             return;
         m_childNodes = adoptPtr(new Vector<RefPtr<Node> >());
         Node* node = m_currentNode.get();
         while (node) {
             m_childNodes->append(node);
@@ skipping 18 matching lines @@
 
     RefPtr<Node> m_currentNode;
     unsigned m_currentIndex;
     OwnPtr<Vector<RefPtr<Node> > > m_childNodes; // Lazily instantiated.
     ChildNodesLazySnapshot* m_nextSnapshot;
 };
 
 } // namespace WebCore
 
 #endif // ContainerNode_h