AutoFill: Refactor the code used to fill a form. Don't fill autocomplete=off

chrome/renderer/form_manager.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_RENDERER_FORM_MANAGER_H_
 #define CHROME_RENDERER_FORM_MANAGER_H_
 
 #include <map>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/string16.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
 
 namespace webkit_glue {
 struct FormData;
 class FormField;
 }  // namespace webkit_glue
 
 namespace WebKit {
 class WebFormControlElement;
@@ skipping 83 matching lines @@
   struct FormElement {
     WebKit::WebFormElement form_element;
     std::vector<WebKit::WebFormControlElement> control_elements;
   };
 
   // A map of vectors of FormElements keyed by the WebFrame containing each
   // form.
   typedef std::map<const WebKit::WebFrame*, std::vector<FormElement*> >
       WebFrameFormElementMap;
 
+  // The callback type used by ForEachMatchingFormField().
+  typedef Callback2<WebKit::WebFormControlElement*,
+                    const webkit_glue::FormField*>::Type Callback;
+
   // Converts a FormElement to FormData storage.  Returns false if the form does
   // not meet all the requirements in the requirements mask.
   // TODO(jhawkins): Modify FormElement so we don't need |frame|.
   static bool FormElementToFormData(const WebKit::WebFrame* frame,
                                     const FormElement* form_element,
                                     RequirementsMask requirements,
                                     webkit_glue::FormData* form);
 
   // Infers corresponding label for |element| from surrounding context in the
-  // DOM.  Contents of preceeding <p> tag or preceeding text element found in
+  // DOM.  Contents of preceding <p> tag or preceding text element found in
   // the form.
   static string16 InferLabelForElement(
       const WebKit::WebFormControlElement& element);
 
+  // Uses the data in |form| to find the cached FormElement.
+  bool FindCachedFormElement(const webkit_glue::FormData& form,
+                             FormElement** form_element);
+
+  // For each field in |form| that matches the corresponding field in the cached
+  // FormElement, |callback| is called with the actual WebFormControlElement and
+  // the FormField data from |form|. This method owns |callback|.
+  void ForEachMatchingFormField(FormElement* form,
+                                const webkit_glue::FormData& data,
+                                Callback* callback);

[dhollowa, 2010/05/28 02:07:07]

Curious, why the need to parameterize the callback?  I only see the one
callback.  So why not just a direct method call?

[James Hawkins, 2010/05/28 02:17:27]

You seem to have forgotten the CL this code came from, where there is also
PreviewForm :-)

+
+  // A ForEachMatchingFormField() callback that sets |field|'s value using the
+  // value in |data|.
+  void FillFormField(WebKit::WebFormControlElement* field,
+                     const webkit_glue::FormField* data);
+
   // The map of form elements.
   WebFrameFormElementMap form_elements_map_;
 
   DISALLOW_COPY_AND_ASSIGN(FormManager);
 };
 
 #endif  // CHROME_RENDERER_FORM_MANAGER_H_