Rename nodes/elements traversal function names.

Source/core/dom/NodeTraversal.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, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2014 Samsung Electronics. 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
@@ skipping 17 matching lines @@
 
 #include "core/dom/ContainerNode.h"
 #include "core/dom/Node.h"
 
 namespace blink {
 
 template <class Iterator> class TraversalRange;
 template <class TraversalNext> class TraversalChildrenIterator;
 template <class TraversalNext> class TraversalDescendantIterator;
 template <class TraversalNext> class TraversalInclusiveDescendantIterator;
-template <class TraversalNext> class TraversalInclusiveNextIterator;
 template <class TraversalNext> class TraversalNextIterator;
 
 class NodeTraversal {
 public:
     using TraversalNodeType = Node;
     // Does a pre-order traversal of the tree to find the next node after this one.
     // This uses the same order that tags appear in the source file. If the stayWithin
     // argument is non-null, the traversal will stop once the specified node is reached.
     // This can be used to restrict traversal to a particular sub-tree.
     static Node* next(const Node& current) { return traverseNextTemplate(current); }
@@ skipping 33 matching lines @@
 
     // Children traversal.
     static Node* childAt(const Node& parent, unsigned index) { return childAtTemplate(parent, index); }
     static Node* childAt(const ContainerNode& parent, unsigned index) { return childAtTemplate(parent, index); }
 
     static Node* nextSibling(const Node& node) { return node.nextSibling(); }
 
     static TraversalRange<TraversalChildrenIterator<NodeTraversal>> childrenOf(const Node&);
     static TraversalRange<TraversalDescendantIterator<NodeTraversal>> descendantsOf(const Node&);
     static TraversalRange<TraversalInclusiveDescendantIterator<NodeTraversal>> inclusiveDescendantsOf(const Node&);
-    static TraversalRange<TraversalInclusiveNextIterator<NodeTraversal>> from(const Node*);
-    static TraversalRange<TraversalNextIterator<NodeTraversal>> fromNext(const Node&);
+    static TraversalRange<TraversalNextIterator<NodeTraversal>> startsAt(const Node*);
+    static TraversalRange<TraversalNextIterator<NodeTraversal>> startsAfter(const Node&);
 
 private:
     template <class NodeType>
     static Node* traverseNextTemplate(NodeType&);
     template <class NodeType>
     static Node* traverseNextTemplate(NodeType&, const Node* stayWithin);
     template <class NodeType>
     static Node* childAtTemplate(NodeType&, unsigned);
 };
 
@@ skipping 27 matching lines @@
     explicit TraversalChildrenIterator(const StartNodeType* start) : TraversalIteratorBase<TraversalNext>(TraversalNext::firstWithin(*start)) { };
     void operator++() { m_current = TraversalNext::nextSibling(*m_current); };
     static TraversalChildrenIterator end() { return TraversalChildrenIterator(); };
 private:
     TraversalChildrenIterator() : TraversalIteratorBase<TraversalNext>(nullptr) { };
 };
 
 template <class TraversalNext>
 class TraversalNextIterator : public TraversalIteratorBase<TraversalNext> {
 public:
-    using StartNodeType = Node;
+    using StartNodeType = typename TraversalNext::TraversalNodeType;
     using TraversalIteratorBase<TraversalNext>::m_current;
-    explicit TraversalNextIterator(const StartNodeType* start) : TraversalIteratorBase<TraversalNext>(TraversalNext::next(*start)) { };
+    explicit TraversalNextIterator(const StartNodeType* start) : TraversalIteratorBase<TraversalNext>(const_cast<StartNodeType*>(start)) { };
     void operator++() { m_current = TraversalNext::next(*m_current); }
-    static TraversalNextIterator end() { return TraversalNextIterator(); };
-private:
-    TraversalNextIterator() : TraversalIteratorBase<TraversalNext>(nullptr) { };
+    static TraversalNextIterator end() { return TraversalNextIterator(nullptr); };
 };
 
 template <class TraversalNext>
-class TraversalInclusiveNextIterator : public TraversalIteratorBase<TraversalNext> {
-public:
-    using StartNodeType = typename TraversalNext::TraversalNodeType;
-    using TraversalIteratorBase<TraversalNext>::m_current;
-    explicit TraversalInclusiveNextIterator(const StartNodeType* start) : TraversalIteratorBase<TraversalNext>(const_cast<StartNodeType*>(start)) { };
-    void operator++() { m_current = TraversalNext::next(*m_current); }
-    static TraversalInclusiveNextIterator end() { return TraversalInclusiveNextIterator(nullptr); };
-};
-
-template <class TraversalNext>
 class TraversalDescendantIterator : public TraversalIteratorBase<TraversalNext> {
 public:
     using StartNodeType = Node;
     using TraversalIteratorBase<TraversalNext>::m_current;
     explicit TraversalDescendantIterator(const StartNodeType* start) : TraversalIteratorBase<TraversalNext>(TraversalNext::firstWithin(*start)), m_root(start) { };
     void operator++() { m_current = TraversalNext::next(*m_current, m_root); }
     static TraversalDescendantIterator end() { return TraversalDescendantIterator(); };
 private:
     TraversalDescendantIterator() : TraversalIteratorBase<TraversalNext>(nullptr), m_root(nullptr) { };
     const Node* m_root;
@@ skipping 20 matching lines @@
 inline TraversalRange<TraversalDescendantIterator<NodeTraversal>> NodeTraversal::descendantsOf(const Node& root)
 {
     return TraversalRange<TraversalDescendantIterator<NodeTraversal>>(&root);
 }
 
 inline TraversalRange<TraversalInclusiveDescendantIterator<NodeTraversal>> NodeTraversal::inclusiveDescendantsOf(const Node& root)
 {
     return TraversalRange<TraversalInclusiveDescendantIterator<NodeTraversal>>(&root);
 }
 
-inline TraversalRange<TraversalInclusiveNextIterator<NodeTraversal>> NodeTraversal::from(const Node* start)
+inline TraversalRange<TraversalNextIterator<NodeTraversal>> NodeTraversal::startsAt(const Node* start)
 {
-    return TraversalRange<TraversalInclusiveNextIterator<NodeTraversal>>(start);
+    return TraversalRange<TraversalNextIterator<NodeTraversal>>(start);
 };
 
-inline TraversalRange<TraversalNextIterator<NodeTraversal>> NodeTraversal::fromNext(const Node& start)
+inline TraversalRange<TraversalNextIterator<NodeTraversal>> NodeTraversal::startsAfter(const Node& start)
 {
-    return TraversalRange<TraversalNextIterator<NodeTraversal>>(&start);
+    return startsAt(NodeTraversal::next(start));
 };
 
 template <class NodeType>
 inline Node* NodeTraversal::traverseNextTemplate(NodeType& current)
 {
     if (current.hasChildren())
         return current.firstChild();
     if (current.nextSibling())
         return current.nextSibling();
     return nextAncestorSibling(current);
@@ skipping 40 matching lines @@
 {
     Node* child = parent.firstChild();
     while (child && index--)
         child = child->nextSibling();
     return child;
 }
 
 } // namespace blink
 
 #endif