Update HTMLCollection.namedItem() to use the id/name cache

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.
  *
  * 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 396 matching lines @@
     // although it returns any type of element by id.
     return element.hasLocalName(appletTag)
         || element.hasLocalName(embedTag)
         || element.hasLocalName(formTag)
         || element.hasLocalName(imgTag)
         || element.hasLocalName(inputTag)
         || element.hasLocalName(objectTag)
         || element.hasLocalName(selectTag);
 }
 
-bool HTMLCollection::checkForNameMatch(const Element& element, bool checkName, const AtomicString& name) const
-{
-    if (!element.isHTMLElement())
-        return false;
-
-    const HTMLElement& e = toHTMLElement(element);
-    if (!checkName)
-        return e.getIdAttribute() == name;
-
-    if (type() == DocAll && !nameShouldBeVisibleInDocumentAll(e))
-        return false;
-
-    return e.getNameAttribute() == name && e.getIdAttribute() != name;
-}
-
 inline Element* firstMatchingChildElement(const HTMLCollection& nodeList, const ContainerNode& root)
 {
     Element* element = ElementTraversal::firstWithin(root);
     while (element && !isMatchingElement(nodeList, *element))
         element = ElementTraversal::nextSkippingChildren(*element, &root);
     return element;
 }
 
 inline Element* nextMatchingChildElement(const HTMLCollection& nodeList, Element& current, const ContainerNode& root)
 {
@@ skipping 44 matching lines @@
     return traverseMatchingElementsForwardToOffset(*this, offset, currentElement, currentOffset, root);
 }
 
 Element* HTMLCollection::namedItem(const AtomicString& name) const
 {
     // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp
     // This method first searches for an object with a matching id
     // attribute. If a match is not found, the method then searches for an
     // object with a matching name attribute, but only on those elements
     // that are allowed a name attribute.
+    updateNameCache();
 
-    ContainerNode& root = rootNode();
-    unsigned i = 0;
-    for (Element* element = traverseToFirstElement(root); element; element = traverseNextElement(*element, root)) {
-        if (checkForNameMatch(*element, /* checkName */ false, name)) {
-            m_collectionIndexCache.setCachedNode(element, i);
-            return element;
-        }
-        i++;
-    }
+    Vector<Element*>* idResults = idCache(name);
+    if (idResults && !idResults->isEmpty())
+        return idResults->first();
 
-    i = 0;
-    for (Element* element = traverseToFirstElement(root); element; element = traverseNextElement(*element, root)) {
-        if (checkForNameMatch(*element, /* checkName */ true, name)) {
-            m_collectionIndexCache.setCachedNode(element, i);
-            return element;
-        }
-        i++;
-    }
+    Vector<Element*>* nameResults = nameCache(name);
+    if (nameResults && !nameResults->isEmpty())
+        return nameResults->first();
 
     return 0;
 }
 
 void HTMLCollection::updateNameCache() const
 {
     if (hasNameCache())
         return;
 
     ContainerNode& root = rootNode();
@@ skipping 31 matching lines @@
 
 void HTMLCollection::append(NodeCacheMap& map, const AtomicString& key, Element* element)
 {
     OwnPtr<Vector<Element*> >& vector = map.add(key.impl(), nullptr).iterator->value;
     if (!vector)
         vector = adoptPtr(new Vector<Element*>);
     vector->append(element);
 }
 
 } // namespace WebCore