Clean WebSearchableFormData.cpp up.

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 34 matching lines @@
 #include "public/web/WebInputElement.h"
 #include "wtf/text/TextEncoding.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 namespace {
 
 // Gets the encoding for the form.
-void GetFormEncoding(const HTMLFormElement* form, WTF::TextEncoding* encoding)
+// TODO(tkent): Use FormDataBuilder::encodingFromAcceptCharset().
+void getFormEncoding(const HTMLFormElement& form, WTF::TextEncoding* encoding)
 {
-    String str(form->getAttribute(HTMLNames::accept_charsetAttr));
+    String str(form.fastGetAttribute(HTMLNames::accept_charsetAttr));
     str.replace(',', ' ');
     Vector<String> charsets;
     str.split(' ', charsets);
-    for (Vector<String>::const_iterator i(charsets.begin()); i != charsets.end(); ++i) {
-        *encoding = WTF::TextEncoding(*i);
+    for (const String& charset : charsets) {
+        *encoding = WTF::TextEncoding(charset);
         if (encoding->isValid())
             return;
     }
-    if (!form->document().loader())
-         return;
-    *encoding = WTF::TextEncoding(form->document().encoding());
+    if (form.document().loader())
+        *encoding = WTF::TextEncoding(form.document().encoding());
 }
 
 // Returns true if the submit request results in an HTTP URL.
-bool IsHTTPFormSubmit(const HTMLFormElement* form)
+bool isHTTPFormSubmit(const HTMLFormElement& form)
 {
-    // FIXME: This function is insane. This is an overly complicated way to get this information.
-    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");
+    // FIXME: This function is insane. This is an overly complicated way to get
+    // this information.
+    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* buttonToActivate(const HTMLFormElement& form)
 {
     HTMLFormControlElement* firstSubmitButton = nullptr;
-    const FormAssociatedElement::List& element = form->associatedElements();
-    for (FormAssociatedElement::List::const_iterator i(element.begin()); i != element.end(); ++i) {
-        if (!(*i)->isFormControlElement())
+    for (auto& element : form.associatedElements()) {
+        if (!element->isFormControlElement())
             continue;
-        HTMLFormControlElement* control = toHTMLFormControlElement(*i);
+        HTMLFormControlElement* control = toHTMLFormControlElement(element);
         if (control->isActivatedSubmit()) {
-            // There's a button that is already activated for submit, return nullptr.
+            // There's a button that is already activated for submit, return
+            // nullptr.
             return nullptr;
         }
         if (!firstSubmitButton && control->isSuccessfulSubmitButton())
             firstSubmitButton = control;
     }
     return firstSubmitButton;
 }
 
 // Returns true if the selected state of all the options matches the default
 // selected state.
-bool IsSelectInDefaultState(HTMLSelectElement* select)
+bool isSelectInDefaultState(const HTMLSelectElement& select)
 {
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = select->listItems();
-    if (select->multiple() || select->size() > 1) {
-        for (WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
-            if (!isHTMLOptionElement(*i))
+    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = select.listItems();
+    if (select.multiple() || select.size() > 1) {
+        for (const auto& item : listItems) {
+            if (!isHTMLOptionElement(*item))
                 continue;
-            HTMLOptionElement* optionElement = toHTMLOptionElement(*i);
-            if (optionElement->selected() != optionElement->hasAttribute(selectedAttr))
+            HTMLOptionElement* optionElement = toHTMLOptionElement(item);
+            if (optionElement->selected() != optionElement->fastHasAttribute(selectedAttr))
                 return false;
         }
         return true;
     }
 
     // The select is rendered as a combobox (called menulist in WebKit). At
     // least one item is selected, determine which one.
     HTMLOptionElement* initialSelected = nullptr;
-    for (WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
-        if (!isHTMLOptionElement(*i))
+    for (const auto& item : listItems) {
+        if (!isHTMLOptionElement(*item))
             continue;
-        HTMLOptionElement* optionElement = toHTMLOptionElement(*i);
-        if (optionElement->hasAttribute(selectedAttr)) {
+        HTMLOptionElement* optionElement = toHTMLOptionElement(item);
+        if (optionElement->fastHasAttribute(selectedAttr)) {
             // The page specified the option to select.
             initialSelected = optionElement;
             break;
         }
         if (!initialSelected)
             initialSelected = optionElement;
     }
     return !initialSelected || initialSelected->selected();
 }
 
 // Returns true if the form element is in its default state, false otherwise.
 // The default state is the state of the form element on initial load of the
 // page, and varies depending upon the form element. For example, a checkbox is
-// in its default state if the checked state matches the state of the checked attribute.
-bool IsInDefaultState(HTMLFormControlElement* formElement)
+// in its default state if the checked state matches the state of the checked
+// attribute.
+bool isInDefaultState(const HTMLFormControlElement& formElement)
 {
-    ASSERT(formElement);
-    if (isHTMLInputElement(*formElement)) {
-        const HTMLInputElement& inputElement = toHTMLInputElement(*formElement);
+    if (isHTMLInputElement(formElement)) {
+        const HTMLInputElement& inputElement = toHTMLInputElement(formElement);
         if (inputElement.type() == InputTypeNames::checkbox || inputElement.type() == InputTypeNames::radio)
-            return inputElement.checked() == inputElement.hasAttribute(checkedAttr);
-    } else if (isHTMLSelectElement(*formElement)) {
-        return IsSelectInDefaultState(toHTMLSelectElement(formElement));
+            return inputElement.checked() == inputElement.fastHasAttribute(checkedAttr);
+    } else if (isHTMLSelectElement(formElement)) {
+        return isSelectInDefaultState(toHTMLSelectElement(formElement));
     }
     return true;
 }
 
 // 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* findSuitableSearchInputElement(const HTMLFormElement& form)
 {
     HTMLInputElement* textElement = nullptr;
-    const FormAssociatedElement::List& element = form->associatedElements();
-    for (FormAssociatedElement::List::const_iterator i(element.begin()); i != element.end(); ++i) {
-        if (!(*i)->isFormControlElement())
+    for (const auto& item : form.associatedElements()) {
+        if (!item->isFormControlElement())
             continue;
 
-        HTMLFormControlElement* control = toHTMLFormControlElement(*i);
+        HTMLFormControlElement& control = toHTMLFormControlElement(*item);
 
-        if (control->isDisabledFormControl() || control->name().isNull())
+        if (control.isDisabledFormControl() || control.name().isNull())
             continue;
 
-        if (!IsInDefaultState(control) || isHTMLTextAreaElement(*control))
+        if (!isInDefaultState(control) || isHTMLTextAreaElement(control))
             return nullptr;
 
-        if (isHTMLInputElement(*control) && control->willValidate()) {
-            const HTMLInputElement& input = toHTMLInputElement(*control);
+        if (isHTMLInputElement(control) && control.willValidate()) {
+            const HTMLInputElement& input = toHTMLInputElement(control);
 
-            // Return nothing if a file upload field or a password field are found.
+            // Return nothing if a file upload field or a password field are
+            // found.
             if (input.type() == InputTypeNames::file || input.type() == InputTypeNames::password)
                 return nullptr;
 
             if (input.isTextField()) {
                 if (textElement) {
-                    // The auto-complete bar only knows how to fill in one value.
-                    // This form has multiple fields; don't treat it as searchable.
+                    // The auto-complete bar only knows how to fill in one
+                    // value.  This form has multiple fields; don't treat it as
+                    // searchable.
                     return nullptr;
                 }
-                textElement = toHTMLInputElement(control);
+                textElement = toHTMLInputElement(&control);
             }
         }
     }
     return textElement;
 }
 
 // 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 buildSearchString(const HTMLFormElement& form, Vector<char>* encodedString, const WTF::TextEncoding& encoding, const HTMLInputElement* textElement)
 {
     bool isElementFound = false;
-
-    const FormAssociatedElement::List& elements = form->associatedElements();
-    for (FormAssociatedElement::List::const_iterator i(elements.begin()); i != elements.end(); ++i) {
-        if (!(*i)->isFormControlElement())
+    for (const auto& item : form.associatedElements()) {
+        if (!item->isFormControlElement())
             continue;
 
-        HTMLFormControlElement* control = toHTMLFormControlElement(*i);
-
-        if (control->isDisabledFormControl() || control->name().isNull())
+        HTMLFormControlElement& control = toHTMLFormControlElement(*item);
+        if (control.isDisabledFormControl() || control.name().isNull())
             continue;
 
-        DOMFormData* formData = DOMFormData::create(*encoding);
-        if (!control->appendFormData(*formData, false))
+        DOMFormData* formData = DOMFormData::create(encoding);
+        if (!control.appendFormData(*formData, false))
             continue;
 
         for (const FormDataList::Item& item : formData->items()) {
             if (!encodedString->isEmpty())
                 encodedString->append('&');
             FormDataBuilder::encodeStringAsFormData(*encodedString, item.key());
             encodedString->append('=');
-            if (control == textElement) {
+            if (&control == textElement) {
                 encodedString->append("{searchTerms}", 13);
                 isElementFound = true;
             } else {
                 FormDataBuilder::encodeStringAsFormData(*encodedString, item.data());
             }
         }
     }
     return isElementFound;
 }
+
 } // namespace
 
 WebSearchableFormData::WebSearchableFormData(const WebFormElement& form, const WebInputElement& selectedInputElement)
 {
     RefPtrWillBeRawPtr<HTMLFormElement> formElement = static_cast<PassRefPtrWillBeRawPtr<HTMLFormElement>>(form);
     HTMLInputElement* inputElement = static_cast<PassRefPtrWillBeRawPtr<HTMLInputElement>>(selectedInputElement).get();
 
     // Only consider forms that GET data.
     // Allow HTTPS only when an input element is provided.
     if (equalIgnoringCase(formElement->getAttribute(methodAttr), "post")
-        || (!IsHTTPFormSubmit(formElement.get()) && !inputElement))
+        || (!isHTTPFormSubmit(*formElement) && !inputElement))
         return;
 
-    Vector<char> encodedString;
     WTF::TextEncoding encoding;
-
-    GetFormEncoding(formElement.get(), &encoding);
+    getFormEncoding(*formElement, &encoding);
     if (!encoding.isValid()) {
         // Need a valid encoding to encode the form elements.
         // If the encoding isn't found webkit ends up replacing the params with
         // empty strings. So, we don't try to do anything here.
         return;
     }
 
     // Look for a suitable search text field in the form when a
     // selectedInputElement is not provided.
     if (!inputElement) {
-        inputElement = findSuitableSearchInputElement(formElement.get());
+        inputElement = findSuitableSearchInputElement(*formElement);
 
         // Return if no suitable text element has been found.
         if (!inputElement)
             return;
     }
 
-    HTMLFormControlElement* firstSubmitButton = GetButtonToActivate(formElement.get());
+    HTMLFormControlElement* firstSubmitButton = buttonToActivate(*formElement);
     if (firstSubmitButton) {
         // The form does not have an active submit button, make the first button
         // active. We need to do this, otherwise the URL will not contain the
         // name of the submit button.
         firstSubmitButton->setActivatedSubmit(true);
     }
 
-    bool isValidSearchString = buildSearchString(formElement.get(), &encodedString, &encoding, inputElement);
+    Vector<char> encodedString;
+    bool isValidSearchString = buildSearchString(*formElement, &encodedString, encoding, inputElement);
 
     if (firstSubmitButton)
         firstSubmitButton->setActivatedSubmit(false);
 
     // Return if the search string is not valid.
     if (!isValidSearchString)
         return;
 
     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