Replace nextSiblingChildren() with simpler nextSibling() when equivalent

Source/core/html/HTMLCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 291 matching lines @@
         || element.hasLocalName(framesetTag)
         || element.hasLocalName(iframeTag)
         || element.hasLocalName(imgTag)
         || element.hasLocalName(inputTag)
         || element.hasLocalName(objectTag)
         || element.hasLocalName(selectTag);
 }
 
 inline Element* firstMatchingChildElement(const HTMLCollection& nodeList, const ContainerNode& root)
 {
-    Element* element = ElementTraversal::firstWithin(root);
+    Element* element = ElementTraversal::firstChild(root);
     while (element && !isMatchingElement(nodeList, *element))
-        element = ElementTraversal::nextSkippingChildren(*element, &root);
+        element = ElementTraversal::nextSibling(*element);
     return element;
 }
 
-inline Element* nextMatchingChildElement(const HTMLCollection& nodeList, Element& current, const ContainerNode& root)
+inline Element* nextMatchingChildElement(const HTMLCollection& nodeList, Element& current)
 {
     Element* next = &current;
     do {
-        next = ElementTraversal::nextSkippingChildren(*next, &root);
+        next = ElementTraversal::nextSibling(*next);
     } while (next && !isMatchingElement(nodeList, *next));
     return next;
 }
 
 Element* HTMLCollection::traverseToFirstElement(const ContainerNode& root) const
 {
     switch (type()) {
     case HTMLTagCollectionType:
         return firstMatchingElement(static_cast<const HTMLTagCollection&>(*this), root);
     case ClassCollectionType:
         return firstMatchingElement(static_cast<const ClassCollection&>(*this), root);
     default:
         if (overridesItemAfter())
             return virtualItemAfter(0);
         if (shouldOnlyIncludeDirectChildren())
             return firstMatchingChildElement(*this, root);
         return firstMatchingElement(*this, root);
     }
 }
 
 inline Element* HTMLCollection::traverseNextElement(Element& previous, const ContainerNode& root) const
 {
     if (overridesItemAfter())
         return virtualItemAfter(&previous);
     if (shouldOnlyIncludeDirectChildren())
-        return nextMatchingChildElement(*this, previous, root);
+        return nextMatchingChildElement(*this, previous);
     return nextMatchingElement(*this, previous, root);
 }
 
 Element* HTMLCollection::traverseForwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset, const ContainerNode& root) const
 {
     ASSERT(currentOffset < offset);
     switch (type()) {
     case HTMLTagCollectionType:
         return traverseMatchingElementsForwardToOffset(static_cast<const HTMLTagCollection&>(*this), offset, currentElement, currentOffset, root);
     case ClassCollectionType:
         return traverseMatchingElementsForwardToOffset(static_cast<const ClassCollection&>(*this), offset, currentElement, currentOffset, root);
     default:
         if (overridesItemAfter()) {
             Element* next = &currentElement;
             while ((next = virtualItemAfter(next))) {
                 if (++currentOffset == offset)
                     return next;
             }
             return 0;
         }
         if (shouldOnlyIncludeDirectChildren()) {
             Element* next = &currentElement;
-            while ((next = nextMatchingChildElement(*this, *next, root))) {
+            while ((next = nextMatchingChildElement(*this, *next))) {
                 if (++currentOffset == offset)
                     return next;
             }
             return 0;
         }
         return traverseMatchingElementsForwardToOffset(*this, offset, currentElement, currentOffset, root);
     }
 }
 
 Element* HTMLCollection::namedItem(const AtomicString& name) const
@@ skipping 96 matching lines @@
 
 void HTMLCollection::append(NodeCacheMap& map, const AtomicString& key, Element* element)
 {
     OwnPtr<Vector<Element*> >& vector = map.add(key.impl(), nullptr).storedValue->value;
     if (!vector)
         vector = adoptPtr(new Vector<Element*>);
     vector->append(element);
 }
 
 } // namespace WebCore