Rename FormAssociatedElement to ListedElement

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

Index: third_party/WebKit/Source/core/html/HTMLFormElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFormElement.cpp b/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
index d6f912c5ded442cbe52e4299353adcdd2bd017fe..297da6e500733e77f9705fb19f73303f64baa823 100644
--- a/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
@@ -155,10 +155,10 @@ void HTMLFormElement::removedFrom(ContainerNode* insertionPoint) {
   if (m_hasElementsAssociatedByParser) {
     Node& root = NodeTraversal::highestAncestorOrSelf(*this);
     if (!m_associatedElementsAreDirty) {
-      FormAssociatedElement::List elements(associatedElements());
+      ListedElement::List elements(associatedElements());
       notifyFormRemovedFromTree(elements, root);
     } else {
-      FormAssociatedElement::List elements;
+      ListedElement::List elements;
       collectAssociatedElements(
           NodeTraversal::highestAncestorOrSelf(*insertionPoint), elements);
       notifyFormRemovedFromTree(elements, root);
@@ -194,7 +194,7 @@ void HTMLFormElement::handleLocalEvents(Event& event) {
 }
 
 unsigned HTMLFormElement::length() const {
-  const FormAssociatedElement::List& elements = associatedElements();
+  const ListedElement::List& elements = associatedElements();
   unsigned len = 0;
   for (unsigned i = 0; i < elements.size(); ++i) {
     if (elements[i]->isEnumeratable())
@@ -211,13 +211,12 @@ void HTMLFormElement::submitImplicitly(Event* event,
                                        bool fromImplicitSubmissionTrigger) {
   int submissionTriggerCount = 0;
   bool seenDefaultButton = false;
-  const FormAssociatedElement::List& elements = associatedElements();
+  const ListedElement::List& elements = associatedElements();
   for (unsigned i = 0; i < elements.size(); ++i) {
-    FormAssociatedElement* formAssociatedElement = elements[i];
-    if (!formAssociatedElement->isFormControlElement())
+    ListedElement* ListedElement = elements[i];

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

Rename this variable to listedElement (lower l)

+    if (!ListedElement->isFormControlElement())
       continue;
-    HTMLFormControlElement* control =
-        toHTMLFormControlElement(formAssociatedElement);
+    HTMLFormControlElement* control = toHTMLFormControlElement(ListedElement);
     if (!seenDefaultButton && control->canBeSuccessfulSubmitButton()) {
       if (fromImplicitSubmissionTrigger)
         seenDefaultButton = true;
@@ -239,7 +238,7 @@ void HTMLFormElement::submitImplicitly(Event* event,
 
 bool HTMLFormElement::validateInteractively() {
   UseCounter::count(document(), UseCounter::FormValidationStarted);
-  const FormAssociatedElement::List& elements = associatedElements();
+  const ListedElement::List& elements = associatedElements();
   for (unsigned i = 0; i < elements.size(); ++i) {
     if (elements[i]->isFormControlElement())
       toHTMLFormControlElement(elements[i])->hideVisibleValidationMessage();
@@ -473,7 +472,7 @@ void HTMLFormElement::reset() {
     return;
   }
 
-  const FormAssociatedElement::List& elements = associatedElements();
+  const ListedElement::List& elements = associatedElements();
   for (unsigned i = 0; i < elements.size(); ++i) {
     if (elements[i]->isFormControlElement())
       toHTMLFormControlElement(elements[i])->reset();
@@ -514,14 +513,14 @@ void HTMLFormElement::parseAttribute(const QualifiedName& name,
   }
 }
 
-void HTMLFormElement::associate(FormAssociatedElement& e) {
+void HTMLFormElement::associate(ListedElement& e) {
   m_associatedElementsAreDirty = true;
   m_associatedElements.clear();
   if (toHTMLElement(e).fastHasAttribute(formAttr))
     m_hasElementsAssociatedByFormAttribute = true;
 }
 
-void HTMLFormElement::disassociate(FormAssociatedElement& e) {
+void HTMLFormElement::disassociate(ListedElement& e) {
   m_associatedElementsAreDirty = true;
   m_associatedElements.clear();
   removeFromPastNamesMap(toHTMLElement(e));
@@ -560,10 +559,10 @@ HTMLFormControlsCollection* HTMLFormElement::elements() {
 
 void HTMLFormElement::collectAssociatedElements(
     Node& root,
-    FormAssociatedElement::List& elements) const {
+    ListedElement::List& elements) const {
   elements.clear();
   for (HTMLElement& element : Traversal<HTMLElement>::startsAfter(root)) {
-    FormAssociatedElement* associatedElement = 0;
+    ListedElement* associatedElement = 0;

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

Rename this variable to listedElement.

     if (element.isFormControlElement())
       associatedElement = toHTMLFormControlElement(&element);
     else if (isHTMLObjectElement(element))
@@ -577,7 +576,7 @@ void HTMLFormElement::collectAssociatedElements(
 
 // This function should be const conceptually. However we update some fields
 // because of lazy evaluation.
-const FormAssociatedElement::List& HTMLFormElement::associatedElements() const {
+const ListedElement::List& HTMLFormElement::associatedElements() const {
   if (!m_associatedElementsAreDirty)
     return m_associatedElements;
   HTMLFormElement* mutableThis = const_cast<HTMLFormElement*>(this);
@@ -663,9 +662,8 @@ bool HTMLFormElement::checkInvalidControlsAndCollectUnhandled(
     CheckValidityEventBehavior eventBehavior) {
   // Copy associatedElements because event handlers called from
   // HTMLFormControlElement::checkValidity() might change associatedElements.
-  const FormAssociatedElement::List& associatedElements =
-      this->associatedElements();
-  HeapVector<Member<FormAssociatedElement>> elements;
+  const ListedElement::List& associatedElements = this->associatedElements();

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

Rename this variable to listedElements.

+  HeapVector<Member<ListedElement>> elements;
   elements.reserveCapacity(associatedElements.size());
   for (unsigned i = 0; i < associatedElements.size(); ++i)
     elements.append(associatedElements[i]);