Refactor autofill form fields.

webkit/glue/form_field.cc

 // 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.
 
 #include "webkit/glue/form_field.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebOptionElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h"
 
 using WebKit::WebFormControlElement;
 using WebKit::WebElement;
 using WebKit::WebInputElement;
 using WebKit::WebOptionElement;
 using WebKit::WebSelectElement;
 using WebKit::WebVector;
 
 namespace webkit_glue {
 
 FormField::FormField()
     : max_length(0),
-      is_autofilled(false) {
+      is_autofilled(false),
+      is_text_input(false) {
 }
 
 // TODO(jhawkins): This constructor should probably be deprecated and the
 // functionality moved to FormManager.
 FormField::FormField(WebFormControlElement element)
     : max_length(0),
       is_autofilled(false) {
   name = element.nameForAutofill();
 
   // TODO(jhawkins): Extract the field label.  For now we just use the field
@@ skipping 27 matching lines @@
                      const string16& value,
                      const string16& form_control_type,
                      int max_length,
                      bool is_autofilled)
   : label(label),
     name(name),
     value(value),
     form_control_type(form_control_type),
     max_length(max_length),
     is_autofilled(is_autofilled) {
+  const char* text_types[] = {"text", "email", "search", "tel", "url",
+      "number", "date", "datetime", "datetime-local", "month", "week",
+      "time", "range"};
+  for(size_t i = 0; i < sizeof(text_types)/sizeof(const char*); ++i)
+    is_text_input |= form_control_type == ASCIIToUTF16(text_types[i]);
 }

[honten.org, 2011/05/17 04:41:18]

It's not clean ;-(

But lots of unit tests use this constructor, and changing it at once is really
messy.

How should I do?

[dhollowa, 2011/05/17 16:47:20]

We should simply have a helper function that does this.  Probably a method in 
|form_field.cc| in an anonymous namespace.  In general it is bad practice to
store a derived value.  Unless there is an explicit reason to cache.

On 2011/05/17 04:41:18, honten wrote:

[honten.org, 2011/05/17 18:45:22]

Actually, I wanted to find the function in |form_field.cc| and
|form_manager.cc|, but I cannot find it.

It might be the following function is the candidate in |form_manager.cc|, 
bool IsTextInput(const WebInputElement* element) {
  if (!element)
    return false;

  return element->isTextField() && !element->isPasswordField();
}

But as you see here, the value is derived from isTextField().

I want to drag the flag, but as you know, it is not good idea:-(

Do you have any idea?

Thanks,
On 2011/05/17 16:47:20, dhollowa wrote:

 
 FormField::~FormField() {
 }
 
 bool FormField::operator==(const FormField& field) const {
   // A FormField stores a value, but the value is not part of the identity of
   // the field, so we don't want to compare the values.
   return (label == field.label &&
           name == field.name &&
           form_control_type == field.form_control_type &&
-          max_length == field.max_length);
+          max_length == field.max_length &&
+          is_text_input == field.is_text_input);
 }
 
 bool FormField::operator!=(const FormField& field) const {
   return !operator==(field);
 }
 
 bool FormField::StrictlyEqualsHack(const FormField& field) const {
   return (label == field.label &&
           name == field.name &&
           value == field.value &&
           form_control_type == field.form_control_type &&
-          max_length == field.max_length);
+          max_length == field.max_length &&
+          is_text_input == field.is_text_input);
 }
 
 std::ostream& operator<<(std::ostream& os, const FormField& field) {
   return os
       << UTF16ToUTF8(field.label)
       << " "
       << UTF16ToUTF8(field.name)
       << " "
       << UTF16ToUTF8(field.value)
       << " "
       << UTF16ToUTF8(field.form_control_type)
       << " "
       << field.max_length;
 }
 
 }  // namespace webkit_glue