Rename FormAssociatedElement to ListedElement

third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp

Index: third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
index 2e17b5628f8400dd80bb7f4476a895cee6b096c3..80f14788dd766a079aab431fa361314fe0d5fb47 100644
--- a/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
@@ -55,8 +55,8 @@ HTMLFormControlsCollection* HTMLFormControlsCollection::create(
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection() {}
 
-const FormAssociatedElement::List&
-HTMLFormControlsCollection::formControlElements() const {
+const ListedElement::List& HTMLFormControlsCollection::formControlElements()
+    const {
   DCHECK(isHTMLFormElement(ownerNode()) || isHTMLFieldSetElement(ownerNode()));
   if (isHTMLFormElement(ownerNode()))
     return toHTMLFormElement(ownerNode()).associatedElements();
@@ -68,12 +68,11 @@ HTMLFormControlsCollection::formImageElements() const {
   return toHTMLFormElement(ownerNode()).imageElements();
 }
 
-static unsigned findFormAssociatedElement(
-    const FormAssociatedElement::List& associatedElements,
-    Element* element) {
+static unsigned findListedElement(const ListedElement::List& associatedElements,
+                                  Element* element) {
   unsigned i = 0;
   for (; i < associatedElements.size(); ++i) {
-    FormAssociatedElement* associatedElement = associatedElements[i];
+    ListedElement* associatedElement = associatedElements[i];
     if (associatedElement->isEnumeratable() &&
         toHTMLElement(associatedElement) == element)
       break;
@@ -83,17 +82,17 @@ static unsigned findFormAssociatedElement(
 
 HTMLElement* HTMLFormControlsCollection::virtualItemAfter(
     Element* previous) const {
-  const FormAssociatedElement::List& associatedElements = formControlElements();
+  const ListedElement::List& associatedElements = formControlElements();

[tkent, 2016/12/02 13:24:37]

Rename this variable to listedElements.

   unsigned offset;
   if (!previous)
     offset = 0;
   else if (m_cachedElement == previous)
     offset = m_cachedElementOffsetInArray + 1;
   else
-    offset = findFormAssociatedElement(associatedElements, previous) + 1;
+    offset = findListedElement(associatedElements, previous) + 1;
 
   for (unsigned i = offset; i < associatedElements.size(); ++i) {
-    FormAssociatedElement* associatedElement = associatedElements[i];
+    ListedElement* associatedElement = associatedElements[i];
     if (associatedElement->isEnumeratable()) {
       m_cachedElement = toHTMLElement(associatedElement);
       m_cachedElementOffsetInArray = i;
@@ -109,10 +108,9 @@ void HTMLFormControlsCollection::invalidateCache(Document* oldDocument) const {
   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) {
@@ -143,10 +141,10 @@ void HTMLFormControlsCollection::updateIdNameCache() const {
   NamedItemCache* cache = NamedItemCache::create();
   HashSet<StringImpl*> foundInputElements;
 
-  const FormAssociatedElement::List& elementsArray = formControlElements();
+  const ListedElement::List& elementsArray = formControlElements();
 
   for (unsigned i = 0; i < elementsArray.size(); ++i) {
-    FormAssociatedElement* associatedElement = elementsArray[i];
+    ListedElement* associatedElement = elementsArray[i];

[tkent, 2016/12/02 13:24:37]

Rename this variable to listedElement.

     if (associatedElement->isEnumeratable()) {
       HTMLElement* element = toHTMLElement(associatedElement);
       const AtomicString& idAttrVal = element->getIdAttribute();