Index: components/autofill/core/browser/personal_data_manager.cc |
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc |
index ca41fd5b5cf8a22f8287fdc02fb3bdc74b62855d..f753af9bce54267f6be9982160dc289579c19d7e 100644 |
--- a/components/autofill/core/browser/personal_data_manager.cc |
+++ b/components/autofill/core/browser/personal_data_manager.cc |
@@ -30,6 +30,7 @@ |
#include "components/autofill/core/browser/validation.h" |
#include "components/autofill/core/common/autofill_pref_names.h" |
#include "components/autofill/core/common/autofill_switches.h" |
+#include "components/autofill/core/common/autofill_util.h" |
#include "components/signin/core/browser/account_tracker_service.h" |
#include "components/signin/core/common/signin_pref_names.h" |
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h" |
@@ -795,14 +796,36 @@ std::vector<Suggestion> PersonalDataManager::GetProfileSuggestions( |
continue; |
base::string16 value_canon = |
AutofillProfile::CanonicalizeProfileString(value); |
- if (base::StartsWith(value_canon, field_contents_canon, true)) { |
- // Prefix match, add suggestion. |
+ // CanonicalizeProfileString() returns lower-case string with separators; |
+ // includes space, line and paragraph along with punctuations like dash, |
+ // start, end and others {U_DASH_PUNCTUATION, U_START_PUNCTUATION, |
+ // U_END_PUNCTUATION, U_CONNECTOR_PUNCTUATION, U_OTHER_PUNCTUATION, |
+ // U_SPACE_SEPARATOR, U_LINE_SEPARATOR, U_PARAGRAPH_SEPARATOR}; substituted |
+ // by whitespaces and trims off trailing whitespace if any. Passing |
+ // |value_canon| and |field_contents_canon| to ContainsTokenThatStartsWith() |
+ // may lead to unexpected result, hence preferred passing |value| and |
+ // |field_contents| instead. |
please use gerrit instead
2015/06/30 19:06:23
I would prefer removing this comment entirely, to
Pritam Nikam
2015/07/01 17:26:00
Done.
|
+ bool prefix_matched_suggestion = |
+ base::StartsWith(value_canon, field_contents_canon, true); |
+ if (prefix_matched_suggestion || |
+ ContainsTokenThatStartsWith(value, field_contents, false)) { |
matched_profiles.push_back(profile); |
suggestions.push_back(Suggestion(value)); |
suggestions.back().backend_id = profile->guid(); |
+ suggestions.back().match = prefix_matched_suggestion |
+ ? Suggestion::PREFIX_MATCH |
+ : Suggestion::SUBSTRING_MATCH; |
} |
} |
+ // Prefix matches should precede other token matches. |
+ if (IsFeatureSubstringMatchEnabled()) { |
+ std::stable_sort(suggestions.begin(), suggestions.end(), |
+ [](const Suggestion& a, const Suggestion& b) { |
+ return a.match < b.match; |
+ }); |
+ } |
+ |
// Don't show two suggestions if one is a subset of the other. |
std::vector<AutofillProfile*> unique_matched_profiles; |
std::vector<Suggestion> unique_suggestions; |
@@ -854,6 +877,7 @@ std::vector<Suggestion> PersonalDataManager::GetCreditCardSuggestions( |
return std::vector<Suggestion>(); |
std::list<const CreditCard*> cards_to_suggest; |
+ std::list<const CreditCard*> substring_matched_cards; |
for (const CreditCard* credit_card : GetCreditCards()) { |
// The value of the stored data for this field type in the |credit_card|. |
base::string16 creditcard_field_value = |
@@ -872,12 +896,24 @@ std::vector<Suggestion> PersonalDataManager::GetCreditCardSuggestions( |
field_contents.size() >= 6)) { |
continue; |
} |
- } else if (!base::StartsWith(creditcard_field_value, field_contents, |
- false)) { |
- continue; |
+ cards_to_suggest.push_back(credit_card); |
+ } else if (base::StartsWith(creditcard_field_value, field_contents, |
+ false)) { |
+ cards_to_suggest.push_back(credit_card); |
+ } else if (ContainsTokenThatStartsWith(creditcard_field_value, |
+ field_contents, false)) { |
+ substring_matched_cards.push_back(credit_card); |
} |
+ } |
- cards_to_suggest.push_back(credit_card); |
+ cards_to_suggest.sort(RankByMfu); |
+ |
+ // Prefix matches should precede other token matches. |
+ if (IsFeatureSubstringMatchEnabled()) { |
+ substring_matched_cards.sort(RankByMfu); |
+ cards_to_suggest.insert(cards_to_suggest.end(), |
+ substring_matched_cards.begin(), |
+ substring_matched_cards.end()); |
} |
// De-dupe card suggestions. Full server cards shadow local cards, and |
@@ -905,8 +941,6 @@ std::vector<Suggestion> PersonalDataManager::GetCreditCardSuggestions( |
} |
} |
- cards_to_suggest.sort(RankByMfu); |
- |
std::vector<Suggestion> suggestions; |
for (const CreditCard* credit_card : cards_to_suggest) { |
// Make a new suggestion. |