Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: Source/WebCore/dom/ContainerNode.h

Issue 11573057: Merge 137702 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/dom/insertedIntoDocument-no-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/ContainerNode.h
===================================================================
--- Source/WebCore/dom/ContainerNode.h (revision 137970)
+++ Source/WebCore/dom/ContainerNode.h (working copy)
@@ -344,7 +344,7 @@
Node* nextNode()
{
if (LIKELY(!hasSnapshot())) {
- Node* node = m_currentNode;
+ Node* node = m_currentNode.get();
if (m_currentNode)
m_currentNode = m_currentNode->nextSibling();
return node;
@@ -360,7 +360,7 @@
if (hasSnapshot())
return;
m_childNodes = adoptPtr(new Vector<RefPtr<Node> >());
- Node* node = m_currentNode;
+ Node* node = m_currentNode.get();
while (node) {
m_childNodes->append(node);
node = node->nextSibling();
@@ -382,7 +382,7 @@
private:
static ChildNodesLazySnapshot* latestSnapshot;
- Node* m_currentNode;
+ RefPtr<Node> m_currentNode;
unsigned m_currentIndex;
OwnPtr<Vector<RefPtr<Node> > > m_childNodes; // Lazily instantiated.
ChildNodesLazySnapshot* m_nextSnapshot;
« no previous file with comments | « LayoutTests/fast/dom/insertedIntoDocument-no-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698