Move matching Element traversal functions from LiveNodeListBase to ElementTraversal

Source/core/dom/LiveNodeListBase.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, 2006, 2007 Apple Inc. All rights reserved.
  * 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
  * License as published by the Free Software Foundation; either
@@ skipping 61 matching lines @@
     virtual void invalidateCache(Document* oldDocument = 0) const = 0;
     void invalidateCacheForAttribute(const QualifiedName*) const;
 
     static bool shouldInvalidateTypeOnAttributeChange(NodeListInvalidationType, const QualifiedName&);
 
 protected:
     Document& document() const { return m_ownerNode->document(); }
 
     ALWAYS_INLINE NodeListRootType rootType() const { return static_cast<NodeListRootType>(m_rootType); }
 
-    template <class NodeListType>
-    static Element* firstMatchingElement(const NodeListType&);
-    template <class NodeListType>
-    static Element* lastMatchingElement(const NodeListType&);
-    template <class NodeListType>
-    static Element* nextMatchingElement(const NodeListType&, Element& current);
-    template <class NodeListType>
-    static Element* previousMatchingElement(const NodeListType&, Element& current);
-    template <class NodeListType>
-    static Element* traverseMatchingElementsForwardToOffset(const NodeListType&, unsigned offset, Element& currentElement, unsigned& currentOffset);
-    template <class NodeListType>
-    static Element* traverseMatchingElementsBackwardToOffset(const NodeListType&, unsigned offset, Element& currentElement, unsigned& currentOffset);
+    template <typename MatchFunc>
+    static Element* traverseMatchingElementsForwardToOffset(Element& currentElement, const ContainerNode* stayWithin, unsigned offset, unsigned& currentOffset, MatchFunc);
+    template <typename MatchFunc>
+    static Element* traverseMatchingElementsBackwardToOffset(Element& currentElement, const ContainerNode* stayWithin, unsigned offset, unsigned& currentOffset, MatchFunc);
 
     virtual void trace(Visitor* visitor) { visitor->trace(m_ownerNode); }
 
 private:
     RefPtrWillBeMember<ContainerNode> m_ownerNode; // Cannot be null.
     const unsigned m_rootType : 1;
     const unsigned m_invalidationType : 4;
     const unsigned m_collectionType : 5;
 };
 
@@ skipping 14 matching lines @@
     case InvalidateOnHRefAttrChange:
         return attrName == HTMLNames::hrefAttr;
     case DoNotInvalidateOnAttributeChanges:
         return false;
     case InvalidateOnAnyAttrChange:
         return true;
     }
     return false;
 }
 
-template <typename NodeListType>
-Element* LiveNodeListBase::lastMatchingElement(const NodeListType& nodeList)
-{
-    ContainerNode& root = nodeList.rootNode();
-    Element* element = ElementTraversal::lastWithin(root);
-    while (element && !isMatchingElement(nodeList, *element))
-        element = ElementTraversal::previous(*element, &root);
-    return element;
-}
-
-template <class NodeListType>
-Element* LiveNodeListBase::firstMatchingElement(const NodeListType& nodeList)
-{
-    ContainerNode& root = nodeList.rootNode();
-    Element* element = ElementTraversal::firstWithin(root);
-    while (element && !isMatchingElement(nodeList, *element))
-        element = ElementTraversal::next(*element, &root);
-    return element;
-}
-
-template <class NodeListType>
-Element* LiveNodeListBase::nextMatchingElement(const NodeListType& nodeList, Element& current)
-{
-    ContainerNode& root = nodeList.rootNode();
-    Element* next = &current;
-    do {
-        next = ElementTraversal::next(*next, &root);
-    } while (next && !isMatchingElement(nodeList, *next));
-    return next;
-}
-
-template <class NodeListType>
-Element* LiveNodeListBase::previousMatchingElement(const NodeListType& nodeList, Element& current)
-{
-    ContainerNode& root = nodeList.rootNode();
-    Element* previous = &current;
-    do {
-        previous = ElementTraversal::previous(*previous, &root);
-    } while (previous && !isMatchingElement(nodeList, *previous));
-    return previous;
-}
-
-template <class NodeListType>
-Element* LiveNodeListBase::traverseMatchingElementsForwardToOffset(const NodeListType& nodeList, unsigned offset, Element& currentElement, unsigned& currentOffset)
+template <typename MatchFunc>
+Element* LiveNodeListBase::traverseMatchingElementsForwardToOffset(Element& currentElement, const ContainerNode* stayWithin, unsigned offset, unsigned& currentOffset, MatchFunc isMatch)
 {
     ASSERT(currentOffset < offset);
-    for (Element* next = nextMatchingElement(nodeList, currentElement); next; next = nextMatchingElement(nodeList, *next)) {
+    for (Element* next = ElementTraversal::next(currentElement, stayWithin, isMatch); next; next = ElementTraversal::next(*next, stayWithin, isMatch)) {
         if (++currentOffset == offset)
             return next;
     }
     return 0;
 }
 
-template <class NodeListType>
-Element* LiveNodeListBase::traverseMatchingElementsBackwardToOffset(const NodeListType& nodeList, unsigned offset, Element& currentElement, unsigned& currentOffset)
+template <typename MatchFunc>
+Element* LiveNodeListBase::traverseMatchingElementsBackwardToOffset(Element& currentElement, const ContainerNode* stayWithin, unsigned offset, unsigned& currentOffset, MatchFunc isMatch)
 {
     ASSERT(currentOffset > offset);
-    for (Element* previous = previousMatchingElement(nodeList, currentElement); previous; previous = previousMatchingElement(nodeList, *previous)) {
+    for (Element* previous = ElementTraversal::previous(currentElement, stayWithin, isMatch); previous; previous = ElementTraversal::previous(*previous, stayWithin, isMatch)) {
         if (--currentOffset == offset)
             return previous;
     }
     return 0;
 }
 
 } // namespace blink
 
 #endif // LiveNodeListBase_h