Add support for autofilling radio buttons and checkboxes.

chrome/renderer/autofill/form_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/autofill/form_cache.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/form_data.h"
 #include "chrome/common/form_data_predictions.h"
@@ skipping 62 matching lines @@
     for (size_t j = 0; j < control_elements.size(); ++j) {
       WebFormControlElement element = control_elements[j];
 
       // Save original values of <select> elements so we can restore them
       // when |ClearFormWithNode()| is invoked.
       if (IsSelectElement(element)) {
         const WebSelectElement select_element =
             element.toConst<WebSelectElement>();
         initial_select_values_.insert(std::make_pair(select_element,
                                                      select_element.value()));
+      } else {
+        const WebInputElement input_element =
+            element.toConst<WebInputElement>();
+        if (IsRadioButtonElement(&input_element) ||
+            IsCheckboxElement(&input_element))
+          initial_checked_state_.insert(
+              std::make_pair(input_element, input_element.isChecked()));
       }
     }
 
     // To avoid overly expensive computation, we impose a minimum number of
     // allowable fields.  The corresponding maximum number of allowable fields
     // is imposed by WebFormElementToFormData().
     if (control_elements.size() < kRequiredAutofillFields)
       continue;
 
     FormData form;
@@ skipping 38 matching lines @@
       if (!element_frame || element_frame == &frame)
         select_values_to_delete.push_back(it->first);
     }
   }
 
   for (std::vector<WebSelectElement>::const_iterator it =
            select_values_to_delete.begin();
        it != select_values_to_delete.end(); ++it) {
     initial_select_values_.erase(*it);
   }
+
+  std::vector<WebInputElement> checked_states_to_delete;
+  for (std::map<const WebInputElement, bool>::const_iterator it =
+           initial_checked_state_.begin();
+       it != initial_checked_state_.end(); ++it) {
+    WebFormElement form_element = it->first.form();
+    if (form_element.isNull()) {
+      checked_states_to_delete.push_back(it->first);
+    } else {
+      const WebFrame* element_frame = form_element.document().frame();
+      if (!element_frame || element_frame == &frame)
+        checked_states_to_delete.push_back(it->first);
+    }
+  }
+
+  for (std::vector<WebInputElement>::const_iterator it =
+           checked_states_to_delete.begin();
+       it != checked_states_to_delete.end(); ++it) {
+    initial_checked_state_.erase(*it);
+  }
 }
 
 bool FormCache::ClearFormWithElement(const WebInputElement& element) {
   WebFormElement form_element = element.form();
   if (form_element.isNull())
     return false;
 
   std::vector<WebFormControlElement> control_elements;
   ExtractAutofillableElements(form_element, autofill::REQUIRE_NONE,
                               &control_elements);
   for (size_t i = 0; i < control_elements.size(); ++i) {
     WebFormControlElement control_element = control_elements[i];
     WebInputElement* input_element = toWebInputElement(&control_element);
     if (IsTextInput(input_element)) {
       // We don't modify the value of disabled fields.
       if (!input_element->isEnabled())
         continue;
 
       input_element->setValue(string16(), true);
       input_element->setAutofilled(false);
 
       // Clearing the value in the focused node (above) can cause selection
       // to be lost. We force selection range to restore the text cursor.
       if (element == *input_element) {
         int length = input_element->value().length();
         input_element->setSelectionRange(length, length);
       }
-    } else {
-      DCHECK(IsSelectElement(control_element));
+    } else if (IsSelectElement(control_element)) {
       WebSelectElement select_element = control_element.to<WebSelectElement>();
 
       std::map<const WebSelectElement, string16>::const_iterator
           initial_value_iter = initial_select_values_.find(select_element);
       if (initial_value_iter != initial_select_values_.end() &&
           select_element.value() != initial_value_iter->second) {
         select_element.setValue(initial_value_iter->second);
         select_element.dispatchFormControlChangeEvent();
       }
+    } else {
+      WebInputElement input_element = control_element.to<WebInputElement>();
+          initial_checked_state_.insert(
+              std::make_pair(input_element, input_element.isChecked()));
+      std::map<const WebInputElement, bool>::const_iterator
+          it = initial_checked_state_.find(input_element);
+      if (it != initial_checked_state_.end() &&
+          input_element.isChecked() != it->second) {
+        input_element.setChecked(it->second, true);
+      }
     }
   }
 
   return true;
 }
 
 bool FormCache::ShowPredictions(const FormDataPredictions& form) {
   DCHECK_EQ(form.data.fields.size(), form.fields.size());
 
   // Find the form.
@@ skipping 55 matching lines @@
         UTF8ToUTF16(form.experiment_id));
     if (!element->hasAttribute("placeholder"))
       element->setAttribute("placeholder", WebString(UTF8ToUTF16(placeholder)));
     element->setAttribute("title", WebString(title));
   }
 
   return true;
 }
 
 }  // namespace autofill