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

components/autofill/core/browser/form_field.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/browser/form_field.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address_field.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_regexes.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/credit_card_field.h"
 #include "components/autofill/core/browser/email_field.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/name_field.h"
 #include "components/autofill/core/browser/phone_field.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace {
 
-bool IsCheckable(const AutofillField* field) {
-  return field->is_checkable;
+bool ShouldBeIgnored(const AutofillField* field) {
+  // Ignore checkable fields as they interfere with parsers assuming context.
+  // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
+  // interferes with correctly understanding ADDRESS_LINE2.
+  // Ignore fields marked as presentational. See
+  // http://www.w3.org/TR/wai-aria/roles#presentation
+  return field->is_checkable ||
+         field->role == FormFieldData::ROLE_ATTRIBUTE_PRESENTATION;
 }
 
 }  // namespace
 
 // static
 void FormField::ParseFormFields(const std::vector<AutofillField*>& fields,
                                 ServerFieldTypeMap* map) {
   // Set up a working copy of the fields to be processed.
   std::vector<AutofillField*> remaining_fields(fields.size());
   std::copy(fields.begin(), fields.end(), remaining_fields.begin());
 
-  // Ignore checkable fields as they interfere with parsers assuming context.
-  // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
-  // interferes with correctly understanding ADDRESS_LINE2.
   remaining_fields.erase(
       std::remove_if(remaining_fields.begin(), remaining_fields.end(),
-                     IsCheckable),
+                     ShouldBeIgnored),
       remaining_fields.end());
 
   // Email pass.
   ParseFormFieldsPass(EmailField::Parse, &remaining_fields, map);
 
   // Phone pass.
   ParseFormFieldsPass(PhoneField::Parse, &remaining_fields, map);
 
   // Address pass.
   ParseFormFieldsPass(AddressField::Parse, &remaining_fields, map);
@@ skipping 127 matching lines @@
   if ((match_type & MATCH_TEXT_AREA) && type == "textarea")
     return true;
 
   if ((match_type & MATCH_PASSWORD) && type == "password")
     return true;
 
   return false;
 }
 
 }  // namespace autofill