Rename FormAssociatedElement to ListedElement

third_party/WebKit/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
@@ skipping 36 matching lines @@
 
 HTMLFormControlsCollection* HTMLFormControlsCollection::create(
     ContainerNode& ownerNode,
     CollectionType type) {
   DCHECK_EQ(type, FormControls);
   return new HTMLFormControlsCollection(ownerNode);
 }
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection() {}
 
-const FormAssociatedElement::List&
-HTMLFormControlsCollection::formControlElements() const {
-  return toHTMLFormElement(ownerNode()).associatedElements();
+const ListedElement::List& HTMLFormControlsCollection::formListedElements()
+    const {
+  return toHTMLFormElement(ownerNode()).listedElements();
 }
 
 const HeapVector<Member<HTMLImageElement>>&
 HTMLFormControlsCollection::formImageElements() const {
   return toHTMLFormElement(ownerNode()).imageElements();
 }
 
-static unsigned findFormAssociatedElement(
-    const FormAssociatedElement::List& associatedElements,
-    Element* element) {
+static unsigned findListedElement(const ListedElement::List& listedElements,
+                                  Element* element) {
   unsigned i = 0;
-  for (; i < associatedElements.size(); ++i) {
-    FormAssociatedElement* associatedElement = associatedElements[i];
-    if (associatedElement->isEnumeratable() &&
-        toHTMLElement(associatedElement) == element)
+  for (; i < listedElements.size(); ++i) {
+    ListedElement* listedElement = listedElements[i];
+    if (listedElement->isEnumeratable() &&
+        toHTMLElement(listedElement) == element)
       break;
   }
   return i;
 }
 
 HTMLElement* HTMLFormControlsCollection::virtualItemAfter(
     Element* previous) const {
-  const FormAssociatedElement::List& associatedElements = formControlElements();
+  const ListedElement::List& listedElements = formListedElements();
   unsigned offset;
   if (!previous)
     offset = 0;
   else if (m_cachedElement == previous)
     offset = m_cachedElementOffsetInArray + 1;
   else
-    offset = findFormAssociatedElement(associatedElements, previous) + 1;
+    offset = findListedElement(listedElements, previous) + 1;
 
-  for (unsigned i = offset; i < associatedElements.size(); ++i) {
-    FormAssociatedElement* associatedElement = associatedElements[i];
-    if (associatedElement->isEnumeratable()) {
-      m_cachedElement = toHTMLElement(associatedElement);
+  for (unsigned i = offset; i < listedElements.size(); ++i) {
+    ListedElement* listedElement = listedElements[i];
+    if (listedElement->isEnumeratable()) {
+      m_cachedElement = toHTMLElement(listedElement);
       m_cachedElementOffsetInArray = i;
       return m_cachedElement;
     }
   }
   return nullptr;
 }
 
 void HTMLFormControlsCollection::invalidateCache(Document* oldDocument) const {
   HTMLCollection::invalidateCache(oldDocument);
   m_cachedElement = nullptr;
   m_cachedElementOffsetInArray = 0;
 }
 
-static HTMLElement* firstNamedItem(
-    const FormAssociatedElement::List& elementsArray,
-    const QualifiedName& attrName,
-    const String& name) {
+static HTMLElement* firstNamedItem(const ListedElement::List& elementsArray,
+                                   const QualifiedName& attrName,
+                                   const String& name) {
   DCHECK(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;
   }
   return nullptr;
 }
 
 HTMLElement* HTMLFormControlsCollection::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.
-  if (HTMLElement* item = firstNamedItem(formControlElements(), idAttr, name))
+  if (HTMLElement* item = firstNamedItem(formListedElements(), idAttr, name))
     return item;
-  return firstNamedItem(formControlElements(), nameAttr, name);
+  return firstNamedItem(formListedElements(), nameAttr, name);
 }
 
 void HTMLFormControlsCollection::updateIdNameCache() const {
   if (hasValidIdNameCache())
     return;
 
   NamedItemCache* cache = NamedItemCache::create();
   HashSet<StringImpl*> foundInputElements;
 
-  const FormAssociatedElement::List& elementsArray = formControlElements();
+  const ListedElement::List& elementsArray = formListedElements();
 
   for (unsigned i = 0; i < elementsArray.size(); ++i) {
-    FormAssociatedElement* associatedElement = elementsArray[i];
-    if (associatedElement->isEnumeratable()) {
-      HTMLElement* element = toHTMLElement(associatedElement);
+    ListedElement* listedElement = elementsArray[i];
+    if (listedElement->isEnumeratable()) {
+      HTMLElement* element = toHTMLElement(listedElement);
       const AtomicString& idAttrVal = element->getIdAttribute();
       const AtomicString& nameAttrVal = element->getNameAttribute();
       if (!idAttrVal.isEmpty()) {
         cache->addElementWithId(idAttrVal, element);
         foundInputElements.add(idAttrVal.impl());
       }
       if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal) {
         cache->addElementWithName(nameAttrVal, element);
         foundInputElements.add(nameAttrVal.impl());
       }
@@ skipping 69 matching lines @@
     }
   }
 }
 
 DEFINE_TRACE(HTMLFormControlsCollection) {
   visitor->trace(m_cachedElement);
   HTMLCollection::trace(visitor);
 }
 
 }  // namespace blink