Use new match Functor ElementTraversal API in DOMSiblingTraversalStrategy

Source/core/css/SiblingTraversalStrategies.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 17 matching lines @@
 
 #ifndef SiblingTraversalStrategies_h
 #define SiblingTraversalStrategies_h
 
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/rendering/style/RenderStyle.h"
 
 namespace blink {
 
-struct DOMSiblingTraversalStrategy {
+class DOMSiblingTraversalStrategy {
+public:
     bool isFirstChild(Element&) const;
     bool isLastChild(Element&) const;
     bool isFirstOfType(Element&, const QualifiedName&) const;
     bool isLastOfType(Element&, const QualifiedName&) const;
 
     int countElementsBefore(Element&) const;
     int countElementsAfter(Element&) const;
     int countElementsOfTypeBefore(Element&, const QualifiedName&) const;
     int countElementsOfTypeAfter(Element&, const QualifiedName&) const;
+
+private:
+    class HasTagName {

[Inactive, 2014/08/14 18:48:50]

We could move this to Element.h if it is used in more places.

+    public:
+        explicit HasTagName(const QualifiedName& tagName) : m_tagName(tagName) { }
+        bool operator() (const Element& element) const { return element.hasTagName(m_tagName); }
+    private:
+        const QualifiedName& m_tagName;
+    };
 };
 
 inline bool DOMSiblingTraversalStrategy::isFirstChild(Element& element) const
 {
     return !ElementTraversal::previousSibling(element);
 }
 
 inline bool DOMSiblingTraversalStrategy::isLastChild(Element& element) const
 {
     return !ElementTraversal::nextSibling(element);
 }
 
 inline bool DOMSiblingTraversalStrategy::isFirstOfType(Element& element, const QualifiedName& type) const
 {
-    for (const Element* sibling = ElementTraversal::previousSibling(element); sibling; sibling = ElementTraversal::previousSibling(*sibling)) {
-        if (sibling->hasTagName(type))
-            return false;
-    }
-    return true;
+    return !ElementTraversal::previousSibling(element, HasTagName(type));
 }
 
 inline bool DOMSiblingTraversalStrategy::isLastOfType(Element& element, const QualifiedName& type) const
 {
-    for (const Element* sibling = ElementTraversal::nextSibling(element); sibling; sibling = ElementTraversal::nextSibling(*sibling)) {
-        if (sibling->hasTagName(type))
-            return false;
-    }
-    return true;
+    return !ElementTraversal::nextSibling(element, HasTagName(type));
 }
 
 inline int DOMSiblingTraversalStrategy::countElementsBefore(Element& element) const
 {
     int count = 0;
     for (const Element* sibling = ElementTraversal::previousSibling(element); sibling; sibling = ElementTraversal::previousSibling(*sibling))
         count++;
 
     return count;
 }
 
 inline int DOMSiblingTraversalStrategy::countElementsOfTypeBefore(Element& element, const QualifiedName& type) const
 {
     int count = 0;
-    for (const Element* sibling = ElementTraversal::previousSibling(element); sibling; sibling = ElementTraversal::previousSibling(*sibling)) {
-        if (sibling->hasTagName(type))
-            ++count;
-    }
-
+    for (const Element* sibling = ElementTraversal::previousSibling(element, HasTagName(type)); sibling; sibling = ElementTraversal::previousSibling(*sibling, HasTagName(type)))
+        ++count;
     return count;
 }
 
 inline int DOMSiblingTraversalStrategy::countElementsAfter(Element& element) const
 {
     int count = 0;
     for (const Element* sibling = ElementTraversal::nextSibling(element); sibling; sibling = ElementTraversal::nextSibling(*sibling))
         ++count;
-
     return count;
 }
 
 inline int DOMSiblingTraversalStrategy::countElementsOfTypeAfter(Element& element, const QualifiedName& type) const
 {
     int count = 0;
-    for (const Element* sibling = ElementTraversal::nextSibling(element); sibling; sibling = ElementTraversal::nextSibling(*sibling)) {
-        if (sibling->hasTagName(type))
-            ++count;
-    }
-
+    for (const Element* sibling = ElementTraversal::nextSibling(element, HasTagName(type)); sibling; sibling = ElementTraversal::nextSibling(*sibling, HasTagName(type)))
+        ++count;
     return count;
 }
 
 class ShadowDOMSiblingTraversalStrategy FINAL {
     STACK_ALLOCATED();
 public:
     ShadowDOMSiblingTraversalStrategy(const WillBeHeapVector<RawPtrWillBeMember<Node>, 32>& siblings, int nth)
         : m_siblings(siblings)
         , m_nth(nth)
     {
@@ skipping 110 matching lines @@
         if (m_siblings[i]->isElementNode() && toElement(m_siblings[i])->hasTagName(type))
             return ++count;
     }
 
     return count;
 }
 
 }
 
 #endif