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

Source/web/WebSearchableFormData.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 62 matching lines @@
     String action(form->action());
     // The isNull() check is trying to avoid completeURL returning KURL() when passed a null string.
     return form->document().completeURL(action.isNull() ? "" : action).protocolIs("http");
 }
 
 // If the form does not have an activated submit button, the first submit
 // button is returned.
 HTMLFormControlElement* GetButtonToActivate(HTMLFormElement* form)
 {
     HTMLFormControlElement* firstSubmitButton = 0;
-    const Vector<FormAssociatedElement*>& element = form->associatedElements();
-    for (Vector<FormAssociatedElement*>::const_iterator i(element.begin()); i != element.end(); ++i) {
+    const FormAssociatedElement::List& element = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator i(element.begin()); i != element.end(); ++i) {
         if (!(*i)->isFormControlElement())
             continue;
         HTMLFormControlElement* control = toHTMLFormControlElement(*i);
         if (control->isActivatedSubmit()) {
             // There's a button that is already activated for submit, return 0.
             return 0;
         }
         if (!firstSubmitButton && control->isSuccessfulSubmitButton())
             firstSubmitButton = control;
     }
@@ skipping 53 matching lines @@
 
 // Look for a suitable search text field in a given HTMLFormElement
 // Return nothing if one of those items are found:
 //  - A text area field
 //  - A file upload field
 //  - A Password field
 //  - More than one text field
 HTMLInputElement* findSuitableSearchInputElement(const HTMLFormElement* form)
 {
     HTMLInputElement* textElement = 0;
-    const Vector<FormAssociatedElement*>& element = form->associatedElements();
-    for (Vector<FormAssociatedElement*>::const_iterator i(element.begin()); i != element.end(); ++i) {
+    const FormAssociatedElement::List& element = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator i(element.begin()); i != element.end(); ++i) {
         if (!(*i)->isFormControlElement())
             continue;
 
         HTMLFormControlElement* control = toHTMLFormControlElement(*i);
 
         if (control->isDisabledFormControl() || control->name().isNull())
             continue;
 
         if (!IsInDefaultState(control) || isHTMLTextAreaElement(*control))
             return 0;
@@ skipping 21 matching lines @@
 // Build a search string based on a given HTMLFormElement and HTMLInputElement
 //
 // Search string output example from www.google.com:
 // "hl=en&source=hp&biw=1085&bih=854&q={searchTerms}&btnG=Google+Search&aq=f&aqi=&aql=&oq="
 //
 // Return false if the provided HTMLInputElement is not found in the form
 bool buildSearchString(const HTMLFormElement* form, Vector<char>* encodedString, WTF::TextEncoding* encoding, const HTMLInputElement* textElement)
 {
     bool isElementFound = false;
 
-    Vector<FormAssociatedElement*> elements = form->associatedElements();
-    for (Vector<FormAssociatedElement*>::const_iterator i(elements.begin()); i != elements.end(); ++i) {
+    const FormAssociatedElement::List& elements = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator i(elements.begin()); i != elements.end(); ++i) {
         if (!(*i)->isFormControlElement())
             continue;
 
         HTMLFormControlElement* control = toHTMLFormControlElement(*i);
 
         if (control->isDisabledFormControl() || control->name().isNull())
             continue;
 
         FormDataList dataList(*encoding);
         if (!control->appendFormData(dataList, false))
@@ skipping 71 matching lines @@
 
     String action(formElement->action());
     KURL url(formElement->document().completeURL(action.isNull() ? "" : action));
     RefPtr<FormData> formData = FormData::create(encodedString);
     url.setQuery(formData->flattenToString());
     m_url = url;
     m_encoding = String(encoding.name());
 }
 
 } // namespace blink