Autofill: Recognize more credit card date fields.

components/autofill/core/browser/credit_card_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/credit_card_field.h"
 
 #include <stddef.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 356 matching lines @@
   static int kMinimum2YearCcExpLength = strlen("12/14");
   int current_field_max_length = scanner->Cursor()->max_length;
   if (current_field_max_length > 0 &&
       current_field_max_length < kMinimum2YearCcExpLength) {
     return false;
   }
 
   if (ParseFieldSpecifics(scanner,
                           base::UTF8ToUTF16(kExpirationDate2DigitYearRe),
                           kMatchTelAndSelect,
+                          &expiration_date_) ||
+      ParseFieldSpecifics(scanner,
+                          base::ASCIIToUTF16("^mm\\s*[-/]\\syy$"),

[Evan Stade, 2015/04/01 23:11:29]

can you add comment explaining why this isn't just part of the other regex?

[Lei Zhang, 2015/04/03 02:02:01]

Sure.

+                          kMatchTelAndSelect,
                           &expiration_date_)) {
     exp_year_type_ = CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR;
     expiration_month_ = nullptr;
     return true;
   }
 
 
   if (ParseFieldSpecifics(scanner,
                           base::UTF8ToUTF16(kExpirationDateRe),
                           kMatchTelAndSelect,
                           &expiration_date_)) {
     if (current_field_max_length > 0 &&
         current_field_max_length < kMinimum4YearCcExpLength) {
       exp_year_type_ = CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR;
     }
     expiration_month_ = nullptr;
     return true;
   }
 
+  if (current_field_max_length > 0 &&
+      current_field_max_length < kMinimum4YearCcExpLength) {
+    return false;
+  }
+
+
+  if (ParseFieldSpecifics(scanner,
+                          base::ASCIIToUTF16("^mm\\s*[-/]\\syyyy$"),

[Evan Stade, 2015/04/01 23:11:30]

ditto. Why isn't this part of the other regex, and why isn't the conditional on
L400 above L388

[Lei Zhang, 2015/04/03 02:02:01]

I reworked the code a little and added more comments to explain what's going on.

+                          kMatchTelAndSelect,
+                          &expiration_date_)) {
+    expiration_month_ = nullptr;
+    return true;
+  }
+
   return false;
 }
 
 ServerFieldType CreditCardField::GetExpirationYearType() const {
   return (expiration_date_
               ? exp_year_type_
               : ((expiration_year_ && expiration_year_->max_length == 2)
                      ? CREDIT_CARD_EXP_2_DIGIT_YEAR
                      : CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 }  // namespace autofill