Oilpan: Prepare to move FormAssociatedElement to Oilpan heap, part 2.

Source/core/html/HTMLFormControlsCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 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 38 matching lines @@
 
 PassRefPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType)
 {
     return adoptRef(new HTMLFormControlsCollection(ownerNode));
 }
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection()
 {
 }
 
-const Vector<FormAssociatedElement*>& HTMLFormControlsCollection::formControlElements() const
+const FormAssociatedElement::List& HTMLFormControlsCollection::formControlElements() const
 {
     ASSERT(isHTMLFormElement(ownerNode()) || isHTMLFieldSetElement(ownerNode()));
     if (isHTMLFormElement(ownerNode()))
         return toHTMLFormElement(ownerNode()).associatedElements();
     return toHTMLFieldSetElement(ownerNode()).associatedElements();
 }
 
 const Vector<HTMLImageElement*>& HTMLFormControlsCollection::formImageElements() const
 {
     return toHTMLFormElement(ownerNode()).imageElements();
 }
 
-static unsigned findFormAssociatedElement(const Vector<FormAssociatedElement*>& associatedElements, Element* element)
+static unsigned findFormAssociatedElement(const FormAssociatedElement::List& associatedElements, Element* element)
 {
     unsigned i = 0;
     for (; i < associatedElements.size(); ++i) {
         FormAssociatedElement* associatedElement = associatedElements[i];
         if (associatedElement->isEnumeratable() && toHTMLElement(associatedElement) == element)
             break;
     }
     return i;
 }
 
 Element* HTMLFormControlsCollection::virtualItemAfter(Element* previous) const
 {
-    const Vector<FormAssociatedElement*>& associatedElements = formControlElements();
+    const FormAssociatedElement::List& associatedElements = formControlElements();
     unsigned offset;
     if (!previous)
         offset = 0;
     else if (m_cachedElement == previous)
         offset = m_cachedElementOffsetInArray + 1;
     else
         offset = findFormAssociatedElement(associatedElements, previous) + 1;
 
     for (unsigned i = offset; i < associatedElements.size(); ++i) {
         FormAssociatedElement* associatedElement = associatedElements[i];
         if (associatedElement->isEnumeratable()) {
             m_cachedElement = toHTMLElement(associatedElement);
             m_cachedElementOffsetInArray = i;
             return m_cachedElement;
         }
     }
     return 0;
 }
 
 void HTMLFormControlsCollection::invalidateCache(Document* oldDocument) const
 {
     HTMLCollection::invalidateCache(oldDocument);
     m_cachedElement = 0;
     m_cachedElementOffsetInArray = 0;
 }
 
-static HTMLElement* firstNamedItem(const Vector<FormAssociatedElement*>& elementsArray,
+static HTMLElement* firstNamedItem(const FormAssociatedElement::List& elementsArray,
     const Vector<HTMLImageElement*>* imageElementsArray, const QualifiedName& attrName, const String& name)
 {
     ASSERT(attrName == idAttr || attrName == nameAttr);
 
     for (unsigned i = 0; i < elementsArray.size(); ++i) {
         HTMLElement* element = toHTMLElement(elementsArray[i]);
         if (elementsArray[i]->isEnumeratable() && element->fastGetAttribute(attrName) == name)
             return element;
     }
 
@@ skipping 26 matching lines @@
 }
 
 void HTMLFormControlsCollection::updateIdNameCache() const
 {
     if (hasValidIdNameCache())
         return;
 
     OwnPtr<NamedItemCache> cache = NamedItemCache::create();
     HashSet<StringImpl*> foundInputElements;
 
-    const Vector<FormAssociatedElement*>& elementsArray = formControlElements();
+    const FormAssociatedElement::List& elementsArray = formControlElements();
 
     for (unsigned i = 0; i < elementsArray.size(); ++i) {
         FormAssociatedElement* associatedElement = elementsArray[i];
         if (associatedElement->isEnumeratable()) {
             HTMLElement* element = toHTMLElement(associatedElement);
             const AtomicString& idAttrVal = element->getIdAttribute();
             const AtomicString& nameAttrVal = element->getNameAttribute();
             if (!idAttrVal.isEmpty()) {
                 cache->addElementWithId(idAttrVal, element);
                 foundInputElements.add(idAttrVal.impl());
@@ skipping 61 matching lines @@
         const AtomicString& nameAttribute = element->getNameAttribute();
         if (!nameAttribute.isEmpty()) {
             HashSet<AtomicString>::AddResult addResult = existingNames.add(nameAttribute);
             if (addResult.isNewEntry)
                 names.append(nameAttribute);
         }
     }
 }
 
 }