Autofill - Fix Harry and David checkout: ignore role="presentation"

components/autofill/core/common/form_field_data.cc

 // Copyright 2013 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 "components/autofill/core/common/form_field_data.h"
 
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
@@ skipping 52 matching lines @@
 FormFieldData::~FormFieldData() {
 }
 
 bool FormFieldData::SameFieldAs(const FormFieldData& field) const {
   // A FormFieldData 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 &&
           autocomplete_attribute == field.autocomplete_attribute &&
+          role == field.role &&
           max_length == field.max_length &&
           // is_checked and is_autofilled counts as "value" since these change
           // when we fill things in.
           is_checkable == field.is_checkable &&
           is_focusable == field.is_focusable &&
           should_autocomplete == field.should_autocomplete &&
           text_direction == field.text_direction);
           // The option values/contents whith are the list of items in the list
           // of a drop-down are currently not considered part of the identity of
           // a form element. This is debatable, since one might base heuristics
           // on the types of elements that are available. Alternatively, one
           // could imagine some forms that dynamically change the element
           // contents (say, insert years starting from the current year) that
           // should not be considered changes in the structure of the form.
 }
 
 bool FormFieldData::operator<(const FormFieldData& field) const {
   // Like operator==, this ignores the value.
   if (label < field.label) return true;
   if (label > field.label) return false;
   if (name < field.name) return true;
   if (name > field.name) return false;
   if (form_control_type < field.form_control_type) return true;
   if (form_control_type > field.form_control_type) return false;
   if (autocomplete_attribute < field.autocomplete_attribute) return true;
   if (autocomplete_attribute > field.autocomplete_attribute) return false;
+  if (role < field.role) return true;
+  if (role > field.role) return false;
   if (max_length < field.max_length) return true;
   if (max_length > field.max_length) return false;
   // Skip is_checked and is_autofilled as in SameFieldAs.
   if (is_checkable < field.is_checkable) return true;
   if (is_checkable > field.is_checkable) return false;
   if (is_focusable < field.is_focusable) return true;
   if (is_focusable > field.is_focusable) return false;
   if (should_autocomplete < field.should_autocomplete) return true;
   if (should_autocomplete > field.should_autocomplete) return false;
   if (text_direction < field.text_direction) return true;
   if (text_direction > field.text_direction) return false;
   // See operator== above for why we don't check option_values/contents.
   return false;
 }
 
 void SerializeFormFieldData(const FormFieldData& field_data,
                             Pickle* pickle) {
   pickle->WriteInt(kPickleVersion);
   pickle->WriteString16(field_data.label);
   pickle->WriteString16(field_data.name);
   pickle->WriteString16(field_data.value);
   pickle->WriteString(field_data.form_control_type);
   pickle->WriteString(field_data.autocomplete_attribute);
+  pickle->WriteString(field_data.role);
   pickle->WriteSizeT(field_data.max_length);
   pickle->WriteBool(field_data.is_autofilled);
   pickle->WriteBool(field_data.is_checked);
   pickle->WriteBool(field_data.is_checkable);
   pickle->WriteBool(field_data.is_focusable);
   pickle->WriteBool(field_data.should_autocomplete);
   pickle->WriteInt(field_data.text_direction);
   AddVectorToPickle(field_data.option_values, pickle);
   AddVectorToPickle(field_data.option_contents, pickle);
 }
 
 bool DeserializeFormFieldData(PickleIterator* iter,
                               FormFieldData* field_data) {
   int version;
   if (!iter->ReadInt(&version)) {
     LOG(ERROR) << "Bad pickle of FormFieldData, no version present";
     return false;
   }
 
   switch (version) {
     case 1: {
       if (!iter->ReadString16(&field_data->label) ||
           !iter->ReadString16(&field_data->name) ||
           !iter->ReadString16(&field_data->value) ||
           !iter->ReadString(&field_data->form_control_type) ||
           !iter->ReadString(&field_data->autocomplete_attribute) ||
+          !iter->ReadString(&field_data->role) ||
           !iter->ReadSizeT(&field_data->max_length) ||
           !iter->ReadBool(&field_data->is_autofilled) ||
           !iter->ReadBool(&field_data->is_checked) ||
           !iter->ReadBool(&field_data->is_checkable) ||
           !iter->ReadBool(&field_data->is_focusable) ||
           !iter->ReadBool(&field_data->should_autocomplete) ||
           !ReadTextDirection(iter, &field_data->text_direction) ||
           !ReadStringVector(iter, &field_data->option_values) ||
           !ReadStringVector(iter, &field_data->option_contents)) {
         LOG(ERROR) << "Could not deserialize FormFieldData from pickle";
@@ skipping 14 matching lines @@
       << base::UTF16ToUTF8(field.label)
       << " "
       << base::UTF16ToUTF8(field.name)
       << " "
       << base::UTF16ToUTF8(field.value)
       << " "
       << field.form_control_type
       << " "
       << field.autocomplete_attribute
       << " "
+      << field.role
+      << " "
       << field.max_length
       << " "
       << (field.is_autofilled ? "true" : "false")
       << " "
       << (field.is_checked ? "true" : "false")
       << " "
       << (field.is_checkable ? "true" : "false")
       << " "
       << (field.is_focusable ? "true" : "false")
       << " "
       << (field.should_autocomplete ? "true" : "false")
       << " "
       << field.text_direction;
 }
 
 }  // namespace autofill