[autofill] Fill in values on a successful run of interactive autocomplete.

chrome/renderer/autofill/form_autofill_util.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_autofill_util.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 455 matching lines @@
     }
 
     if (!element->isEnabled() || element->isReadOnly() ||
         !element->isFocusable())
       continue;
 
     callback(element, &data.fields[i], is_initiating_element);
   }
 }
 
-// Sets the |field|'s value to the value in |data|.
-// Also sets the "autofilled" attribute, causing the background to be yellow.
-void FillFormField(WebKit::WebFormControlElement* field,
-                   const FormFieldData* data,
-                   bool is_initiating_node) {
-  // Nothing to fill.
-  if (data->value.empty())
-    return;
-
-  WebInputElement* input_element = toWebInputElement(field);
-  if (IsTextInput(input_element)) {
-    // If the maxlength attribute contains a negative value, maxLength()
-    // returns the default maxlength value.
-    input_element->setValue(
-        data->value.substr(0, input_element->maxLength()), true);
-    input_element->setAutofilled(true);
-    if (is_initiating_node) {
-      int length = input_element->value().length();
-      input_element->setSelectionRange(length, length);
-      // Clear the current IME composition (the underline), if there is one.
-      input_element->document().frame()->unmarkText();
-    }
-  } else {
-    DCHECK(IsSelectElement(*field));
-    WebSelectElement select_element = field->to<WebSelectElement>();
-    if (select_element.value() != data->value) {
-      select_element.setValue(data->value);
-      select_element.dispatchFormControlChangeEvent();
-    }
-  }
-}
-
 // Sets the |field|'s "suggested" (non JS visible) value to the value in |data|.
 // Also sets the "autofilled" attribute, causing the background to be yellow.
 void PreviewFormField(WebKit::WebFormControlElement* field,
                       const FormFieldData* data,
                       bool is_initiating_node) {
   // Nothing to preview.
   if (data->value.empty())
     return;
 
   // Only preview input fields.
@@ skipping 298 matching lines @@
   WebFormElement form_element = element.form();
   if (form_element.isNull())
     return;
 
   ForEachMatchingFormField(form_element,
                            element,
                            form,
                            &FillFormField);
 }
 
+// Sets the |field|'s value to the value in |data|.
+// Also sets the "autofilled" attribute, causing the background to be yellow.
+void FillFormField(WebKit::WebFormControlElement* field,
+                   const FormFieldData* data,
+                   bool is_initiating_node) {
+  // Nothing to fill.
+  if (data->value.empty())
+    return;
+
+  WebInputElement* input_element = toWebInputElement(field);
+  if (IsTextInput(input_element)) {
+    // If the maxlength attribute contains a negative value, maxLength()
+    // returns the default maxlength value.
+    input_element->setValue(
+        data->value.substr(0, input_element->maxLength()), true);
+    input_element->setAutofilled(true);
+    if (is_initiating_node) {
+      int length = input_element->value().length();
+      input_element->setSelectionRange(length, length);
+      // Clear the current IME composition (the underline), if there is one.
+      input_element->document().frame()->unmarkText();
+    }
+  } else {
+    DCHECK(IsSelectElement(*field));
+    WebSelectElement select_element = field->to<WebSelectElement>();
+    if (select_element.value() != data->value) {
+      select_element.setValue(data->value);
+      select_element.dispatchFormControlChangeEvent();
+    }
+  }
+}

[Ilya Sherman, 2012/11/29 00:08:59]

I'm assuming this just got moved, with no changes to the code -- oui?  (I wish
our code review tool would just show that...)

[Dan Beam, 2012/11/29 00:51:13]

Yes, moved out of an anonymous namespace.

+
 void PreviewForm(const FormData& form, const WebInputElement& element) {
   WebFormElement form_element = element.form();
   if (form_element.isNull())
     return;
 
   ForEachMatchingFormField(form_element,
                            element,
                            form,
                            &PreviewFormField);
 }
@@ skipping 60 matching lines @@
       continue;
 
     if (input_element->isAutofilled())
       return true;
   }
 
   return false;
 }
 
 }  // namespace autofill