Only load text fields in the form structure. This prevents us from trying to...

chrome/browser/autofill/form_structure.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/autofill/form_structure.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_field.h"
 #include "third_party/libjingle/files/talk/xmllite/xmlelement.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/form_field_values.h"
 
-const char* kFormMethodGet = "get";
+namespace {
+
 const char* kFormMethodPost = "post";
 
-// XML attribute names
+// XML attribute names.
 const char* const kAttributeClientVersion = "clientversion";
 const char* const kAttributeAutoFillUsed = "autofillused";
 const char* const kAttributeSignature = "signature";
 const char* const kAttributeFormSignature = "formsignature";
 const char* const kAttributeDataPresent = "datapresent";
 
 const char* const kXMLElementForm = "form";
 const char* const kXMLElementField = "field";
 const char* const kAttributeAutoFillType = "autofilltype";
 
-namespace {
+// The only form control type we handle currently.
+const char* const kControlTypeText = "text";
+
+// The number of fillable fields necessary for a form to be fillable.
+const size_t kRequiredFillableFields = 3;
 
 static std::string Hash64Bit(const std::string& str) {
   std::string hash_bin = base::SHA1HashString(str);
   DCHECK_EQ(20U, hash_bin.length());
 
   uint64 hash64 = (((static_cast<uint64>(hash_bin[0])) & 0xFF) << 56) |
                   (((static_cast<uint64>(hash_bin[1])) & 0xFF) << 48) |
                   (((static_cast<uint64>(hash_bin[2])) & 0xFF) << 40) |
                   (((static_cast<uint64>(hash_bin[3])) & 0xFF) << 32) |
                   (((static_cast<uint64>(hash_bin[4])) & 0xFF) << 24) |
                   (((static_cast<uint64>(hash_bin[5])) & 0xFF) << 16) |
                   (((static_cast<uint64>(hash_bin[6])) & 0xFF) << 8) |
                    ((static_cast<uint64>(hash_bin[7])) & 0xFF);
 
   return Uint64ToString(hash64);
 }
 
 }  // namespace
 
 FormStructure::FormStructure(const webkit_glue::FormFieldValues& values)
     : form_name_(UTF16ToUTF8(values.form_name)),
       source_url_(values.source_url),
       target_url_(values.target_url) {
   // Copy the form fields.
   std::vector<webkit_glue::FormField>::const_iterator field;
   for (field = values.elements.begin();
        field != values.elements.end(); field++) {
+    // We currently only handle text fields.  This prevents us from thinking we
+    // can autofill other types of controls, e.g., select, password, hidden.
+    if (!LowerCaseEqualsASCII(field->form_control_type(), kControlTypeText))
+      continue;
+
     // Generate a unique name for this field by appending a counter to the name.
     string16 unique_name = field->name() + IntToString16(fields_.size() + 1);
     fields_.push_back(new AutoFillField(*field, unique_name));
   }
 
   // Terminate the vector with a NULL item.
   fields_.push_back(NULL);
 
   std::string method = UTF16ToUTF8(values.method);
   if (method == kFormMethodPost) {
@@ skipping 87 matching lines @@
 std::string FormStructure::FormSignature() const {
   std::string form_string = target_url_.host() +
                             "&" +
                             form_name_ +
                             form_signature_field_names_;
 
   return Hash64Bit(form_string);
 }
 
 bool FormStructure::IsAutoFillable() const {
-  if (field_count() == 0)
+  if (field_count() < kRequiredFillableFields)
     return false;
 
   // Rule out http(s)://*/search?...
   //  e.g. http://www.google.com/search?q=...
   //       http://search.yahoo.com/search?p=...
   if (target_url_.path() == "/search")
     return false;
 
-  // Disqualify all forms that are likely to be search boxes (like google.com).
-  if (field_count() == 1) {
-    std::string name = UTF16ToUTF8(fields_[0]->name());
-    if (name == "q")
-      return false;
-  }
-
   if (method_ == GET)
     return false;
 
   return true;
 }
 
 void FormStructure::set_possible_types(int index, const FieldTypeSet& types) {
   int num_fields = static_cast<int>(field_count());
   DCHECK(index >= 0 && index < num_fields);
   if (index >= 0 && index < num_fields)
@@ skipping 26 matching lines @@
 
 void FormStructure::GetHeuristicFieldInfo(FieldTypeMap* field_type_map) {
   FormFieldSet fields = FormFieldSet(this);
 
   FormFieldSet::const_iterator field;
   for (field = fields.begin(); field != fields.end(); field++) {
     bool ok = (*field)->GetFieldInfo(field_type_map);
     DCHECK(ok);
   }
 }