Fix a bug that would cause the AutoFill server to return an error.

We were pushing the <option> elements associated with <select> tags
into the form field vector that AutoFill uses. This is not correct
as they are not used by the server and result in duplicate field
signatures in the XML requests. As the signatures should be unique,
the server returns an error response.

Change-Id: I359a952cf219e088c2cae886907f563d86756688

1 files changed, 4 insertions, 1 deletions

diff --git a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
index c97a2a8..8f0467b 100644
--- a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
@@ -217,6 +217,8 @@ bool FormManager::HTMLFormElementToFormData(HTMLFormElement& element,
     std::vector<bool> fields_extracted(control_elements.size(), false);
     for (size_t i = 0; i < control_elements.size(); ++i) {
         const HTMLFormControlElement* control_element = control_elements[i];
+        if (!(control_element->hasTagName(inputTag) || control_element->hasTagName(selectTag)))
+            continue;
 
         if (requirements & REQUIRE_AUTOCOMPLETE &&
             control_element->type() == WTF::String("text")) {
@@ -305,7 +307,8 @@ void FormManager::ExtractForms(WebCore::Document* document) {
             size_t size = elements.size();
             for (size_t i = 0; i < size; i++) {
                 WebCore::HTMLFormControlElement* e = elements[i];
-                form_elements->control_elements.push_back(e);
+                if (e->hasTagName(inputTag) || e->hasTagName(selectTag))
+                    form_elements->control_elements.push_back(e);
             }
             form_elements->form_element = form;
         }