Introduce NodeTraversal::ancestorsOf() and inclusiveAncestors() for range-based for loop

third_party/WebKit/Source/core/dom/NodeTraversal.cpp

 /*
  * 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, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * 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 31 matching lines @@
 }
 
 Node* NodeTraversal::nextIncludingPseudo(const Node& current, const Node* stayWithin)
 {
     if (Node* next = current.pseudoAwareFirstChild())
         return next;
     if (current == stayWithin)
         return 0;
     if (Node* next = current.pseudoAwareNextSibling())
         return next;
-    for (Node* parent = current.parentNode(); parent; parent = parent->parentNode()) {
+    for (Node& parent : ancestorsOf(current)) {
         if (parent == stayWithin)
             return 0;
-        if (Node* next = parent->pseudoAwareNextSibling())
+        if (Node* next = parent.pseudoAwareNextSibling())
             return next;
     }
     return 0;
 }
 
 Node* NodeTraversal::nextIncludingPseudoSkippingChildren(const Node& current, const Node* stayWithin)
 {
     if (current == stayWithin)
         return 0;
     if (Node* next = current.pseudoAwareNextSibling())
         return next;
-    for (Node* parent = current.parentNode(); parent; parent = parent->parentNode()) {
+    for (Node& parent : ancestorsOf(current)) {
         if (parent == stayWithin)
             return 0;
-        if (Node* next = parent->pseudoAwareNextSibling())
+        if (Node* next = parent.pseudoAwareNextSibling())
             return next;
     }
     return 0;
 }
 
 Node* NodeTraversal::nextAncestorSibling(const Node& current)
 {
     DCHECK(!current.nextSibling());
-    for (Node* parent = current.parentNode(); parent; parent = parent->parentNode()) {
-        if (parent->nextSibling())
-            return parent->nextSibling();
+    for (Node& parent : ancestorsOf(current)) {
+        if (parent.nextSibling())
+            return parent.nextSibling();
     }
     return 0;
 }
 
 Node* NodeTraversal::nextAncestorSibling(const Node& current, const Node* stayWithin)
 {
     DCHECK(!current.nextSibling());
     DCHECK_NE(current, stayWithin);
-    for (Node* parent = current.parentNode(); parent; parent = parent->parentNode()) {
+    for (Node& parent : ancestorsOf(current)) {
         if (parent == stayWithin)
             return 0;
-        if (parent->nextSibling())
-            return parent->nextSibling();
+        if (parent.nextSibling())
+            return parent.nextSibling();
     }
     return 0;
 }
 
 Node* NodeTraversal::lastWithin(const ContainerNode& current)
 {
     Node* descendant = current.lastChild();
     for (Node* child = descendant; child; child = child->lastChild())
         descendant = child;
     return descendant;
@@ skipping 17 matching lines @@
     }
     return current.parentNode();
 }
 
 Node* NodeTraversal::previousSkippingChildren(const Node& current, const Node* stayWithin)
 {
     if (current == stayWithin)
         return 0;
     if (current.previousSibling())
         return current.previousSibling();
-    for (Node* parent = current.parentNode(); parent; parent = parent->parentNode()) {
+    for (Node& parent : ancestorsOf(current)) {
         if (parent == stayWithin)
             return 0;
-        if (parent->previousSibling())
-            return parent->previousSibling();
+        if (parent.previousSibling())
+            return parent.previousSibling();
     }
     return 0;
 }
 
 Node* NodeTraversal::nextPostOrder(const Node& current, const Node* stayWithin)
 {
     if (current == stayWithin)
         return 0;
     if (!current.nextSibling())
         return current.parentNode();
     Node* next = current.nextSibling();
     while (Node* child = next->firstChild())
         next = child;
     return next;
 }
 
 static Node* previousAncestorSiblingPostOrder(const Node& current, const Node* stayWithin)
 {
     DCHECK(!current.previousSibling());
-    for (Node* parent = current.parentNode(); parent; parent = parent->parentNode()) {
+    for (Node& parent : NodeTraversal::ancestorsOf(current)) {
         if (parent == stayWithin)
             return 0;
-        if (parent->previousSibling())
-            return parent->previousSibling();
+        if (parent.previousSibling())
+            return parent.previousSibling();
     }
     return 0;
 }
 
 Node* NodeTraversal::previousPostOrder(const Node& current, const Node* stayWithin)
 {
     if (Node* lastChild = current.lastChild())
         return lastChild;
     if (current == stayWithin)
         return 0;
     if (current.previousSibling())
         return current.previousSibling();
     return previousAncestorSiblingPostOrder(current, stayWithin);
 }
 
 Node* NodeTraversal::commonAncestor(const Node& nodeA, const Node& nodeB)
 {
     return Range::commonAncestorContainer(&nodeA, &nodeB);
 }
 
 } // namespace blink