Introduce EphemeralRange::nodes() helper to traverse over a range.

third_party/WebKit/Source/core/editing/EphemeralRange.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EphemeralRange_h
 #define EphemeralRange_h
 
 #include "core/editing/Position.h"
 
 namespace blink {
@@ skipping 77 matching lines @@
 extern template class CORE_EXTERN_TEMPLATE_EXPORT EphemeralRangeTemplate<EditingStrategy>;
 using EphemeralRange = EphemeralRangeTemplate<EditingStrategy>;
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT EphemeralRangeTemplate<EditingInFlatTreeStrategy>;
 using EphemeralRangeInFlatTree = EphemeralRangeTemplate<EditingInFlatTreeStrategy>;
 
 // Returns a newly created |Range| object from |range| or |nullptr| if
 // |range.isNull()| returns true.
 CORE_EXPORT Range* createRange(const EphemeralRange& /* range */);
 
+namespace internal {

[tkent, 2016/08/17 02:05:02]

We shouldn't add |internal| namespace.  These template classes can be used
outside of EphemeralRange class.

[Andrey Kraynov, 2016/08/17 09:58:16]

Done.

+
+// We should restrict access to the unwanted version of |TraversalRange::end()| function.
+template <class Iterator>
+class TraversalRangeImpl : private TraversalRange<Iterator> {
+    STACK_ALLOCATED();
+public:
+    using StartNodeType = typename TraversalRange<Iterator>::StartNodeType;
+    TraversalRangeImpl(const StartNodeType* start, const StartNodeType* pastEndNode)
+        : TraversalRange<Iterator>(start), m_pastEndNode(pastEndNode) { }
+
+    using TraversalRange<Iterator>::begin;
+
+    Iterator end() { return Iterator(m_pastEndNode); }
+
+private:
+    Member<const StartNodeType> m_pastEndNode;
+};
+
+template <class TraversalNext>
+class CheckedTraversalNextIterator : public TraversalNextIterator<TraversalNext> {
+    STACK_ALLOCATED();
+public:
+    using StartNodeType = typename TraversalNextIterator<TraversalNext>::StartNodeType;
+    explicit CheckedTraversalNextIterator(const StartNodeType* start) : TraversalNextIterator<TraversalNext>(start) { }
+
+    bool isNull() const { return !TraversalNextIterator<TraversalNext>::m_current; }
+    void setCurrent(Node* current) { TraversalNextIterator<TraversalNext>::m_current = current; }
+};
+
+using RangeTraversal = TraversalRangeImpl<CheckedTraversalNextIterator<NodeTraversal>>;

[tkent, 2016/08/17 02:05:02]

We shouldn't put them in |internal| namespace.  These classes are used outside
of EphemeralRange class.

[Andrey Kraynov, 2016/08/17 09:58:16]

Done.

+using RangeTraversalInFlatTree = TraversalRangeImpl<CheckedTraversalNextIterator<FlatTreeTraversal>>;
+
+} // namespace internal
+
+internal::RangeTraversal inRange(const Position& start, const Position& end);
+internal::RangeTraversalInFlatTree inRange(const PositionInFlatTree& start, const PositionInFlatTree& end);
+
+internal::RangeTraversal inRange(const EphemeralRange&);
+internal::RangeTraversalInFlatTree inRange(const EphemeralRangeInFlatTree&);
+
 } // namespace blink
 
 #endif