Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: components/autofill/content/renderer/password_autofill_agent.cc

Issue 962673004: [Autofill/Autocomplete Feature] Substring matching instead of prefix matching. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporates Evan's review comments. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/autofill/content/renderer/password_autofill_agent.h" 5 #include "components/autofill/content/renderer/password_autofill_agent.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "components/autofill/content/common/autofill_messages.h" 14 #include "components/autofill/content/common/autofill_messages.h"
15 #include "components/autofill/content/renderer/form_autofill_util.h" 15 #include "components/autofill/content/renderer/form_autofill_util.h"
16 #include "components/autofill/content/renderer/password_form_conversion_utils.h" 16 #include "components/autofill/content/renderer/password_form_conversion_utils.h"
17 #include "components/autofill/content/renderer/renderer_save_password_progress_l ogger.h" 17 #include "components/autofill/content/renderer/renderer_save_password_progress_l ogger.h"
18 #include "components/autofill/core/common/autofill_constants.h" 18 #include "components/autofill/core/common/autofill_constants.h"
19 #include "components/autofill/core/common/autofill_switches.h" 19 #include "components/autofill/core/common/autofill_switches.h"
20 #include "components/autofill/core/common/autofill_util.h"
20 #include "components/autofill/core/common/form_field_data.h" 21 #include "components/autofill/core/common/form_field_data.h"
21 #include "components/autofill/core/common/password_form.h" 22 #include "components/autofill/core/common/password_form.h"
22 #include "components/autofill/core/common/password_form_fill_data.h" 23 #include "components/autofill/core/common/password_form_fill_data.h"
23 #include "content/public/renderer/document_state.h" 24 #include "content/public/renderer/document_state.h"
24 #include "content/public/renderer/navigation_state.h" 25 #include "content/public/renderer/navigation_state.h"
25 #include "content/public/renderer/render_frame.h" 26 #include "content/public/renderer/render_frame.h"
26 #include "content/public/renderer/render_view.h" 27 #include "content/public/renderer/render_view.h"
27 #include "third_party/WebKit/public/platform/WebVector.h" 28 #include "third_party/WebKit/public/platform/WebVector.h"
28 #include "third_party/WebKit/public/web/WebAutofillClient.h" 29 #include "third_party/WebKit/public/web/WebAutofillClient.h"
29 #include "third_party/WebKit/public/web/WebDocument.h" 30 #include "third_party/WebKit/public/web/WebDocument.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 219
219 bool IsElementEditable(const blink::WebInputElement& element) { 220 bool IsElementEditable(const blink::WebInputElement& element) {
220 return element.isEnabled() && !element.isReadOnly(); 221 return element.isEnabled() && !element.isReadOnly();
221 } 222 }
222 223
223 bool DoUsernamesMatch(const base::string16& username1, 224 bool DoUsernamesMatch(const base::string16& username1,
224 const base::string16& username2, 225 const base::string16& username2,
225 bool exact_match) { 226 bool exact_match) {
226 if (exact_match) 227 if (exact_match)
227 return username1 == username2; 228 return username1 == username2;
228 return StartsWith(username1, username2, true); 229 return StartsWith(username1, username2, true) ||
230 IsContentsPrefixOfSuggestionToken(username1, username2, true);
229 } 231 }
230 232
231 // Returns |true| if the given element is editable. Otherwise, returns |false|. 233 // Returns |true| if the given element is editable. Otherwise, returns |false|.
232 bool IsElementAutocompletable(const blink::WebInputElement& element) { 234 bool IsElementAutocompletable(const blink::WebInputElement& element) {
233 return IsElementEditable(element); 235 return IsElementEditable(element);
234 } 236 }
235 237
236 // Returns true if the password specified in |form| is a default value. 238 // Returns true if the password specified in |form| is a default value.
237 bool PasswordValueIsDefault(const base::string16& password_element, 239 bool PasswordValueIsDefault(const base::string16& password_element,
238 const base::string16& password_value, 240 const base::string16& password_value,
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // fields. 410 // fields.
409 411
410 // Input matches the username, fill in required values. 412 // Input matches the username, fill in required values.
411 if (!username_element->isNull() && 413 if (!username_element->isNull() &&
412 IsElementAutocompletable(*username_element)) { 414 IsElementAutocompletable(*username_element)) {
413 username_element->setValue(username, true); 415 username_element->setValue(username, true);
414 nonscript_modified_values[*username_element] = username; 416 nonscript_modified_values[*username_element] = username;
415 username_element->setAutofilled(true); 417 username_element->setAutofilled(true);
416 418
417 if (set_selection) { 419 if (set_selection) {
418 username_element->setSelectionRange(current_username.length(), 420 if (IsFeatureSubstringMatchEnabled()) {
419 username.length()); 421 size_t start =
422 autofill::GetTextSelectionStart(username, current_username);
423 if (start != base::string16::npos)
424 username_element->setSelectionRange(start, username.length());
425 } else {
426 username_element->setSelectionRange(current_username.length(),
427 username.length());
428 }
420 } 429 }
421 } else if (current_username != username) { 430 } else if (current_username != username) {
422 // If the username can't be filled and it doesn't match a saved password 431 // If the username can't be filled and it doesn't match a saved password
423 // as is, don't autofill a password. 432 // as is, don't autofill a password.
424 return other_possible_username_selected; 433 return other_possible_username_selected;
425 } 434 }
426 435
427 // Wait to fill in the password until a user gesture occurs. This is to make 436 // Wait to fill in the password until a user gesture occurs. This is to make
428 // sure that we do not fill in the DOM with a password until we believe the 437 // sure that we do not fill in the DOM with a password until we believe the
429 // user is intentionally interacting with the page. 438 // user is intentionally interacting with the page.
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 const blink::WebString& password) { 755 const blink::WebString& password) {
747 blink::WebInputElement username_element; 756 blink::WebInputElement username_element;
748 PasswordInfo* password_info; 757 PasswordInfo* password_info;
749 758
750 if (!FindLoginInfo(node, &username_element, &password_info) || 759 if (!FindLoginInfo(node, &username_element, &password_info) ||
751 !IsElementAutocompletable(username_element) || 760 !IsElementAutocompletable(username_element) ||
752 !IsElementAutocompletable(password_info->password_field)) { 761 !IsElementAutocompletable(password_info->password_field)) {
753 return false; 762 return false;
754 } 763 }
755 764
765 base::string16 current_username = username_element.value();
766 base::string16 suggested_username = username;
756 was_username_autofilled_ = username_element.isAutofilled(); 767 was_username_autofilled_ = username_element.isAutofilled();
757 username_selection_start_ = username_element.selectionStart(); 768 username_selection_start_ = username_element.selectionStart();
758 username_element.setSuggestedValue(username); 769 username_element.setSuggestedValue(username);
759 username_element.setAutofilled(true); 770 username_element.setAutofilled(true);
760 username_element.setSelectionRange( 771
761 username_selection_start_, 772 if (IsFeatureSubstringMatchEnabled()) {
762 username_element.suggestedValue().length()); 773 size_t start =
774 autofill::GetTextSelectionStart(suggested_username, current_username);
775 if (start != base::string16::npos) {
776 username_element.setSelectionRange(start, suggested_username.length());
777 was_username_autofilled_ = start;
778 }
779 } else {
780 username_element.setSelectionRange(
781 username_selection_start_, username_element.suggestedValue().length());
782 }
763 783
764 was_password_autofilled_ = password_info->password_field.isAutofilled(); 784 was_password_autofilled_ = password_info->password_field.isAutofilled();
765 password_info->password_field.setSuggestedValue(password); 785 password_info->password_field.setSuggestedValue(password);
766 password_info->password_field.setAutofilled(true); 786 password_info->password_field.setAutofilled(true);
767 787
768 return true; 788 return true;
769 } 789 }
770 790
771 bool PasswordAutofillAgent::DidClearAutofillSelection( 791 bool PasswordAutofillAgent::DidClearAutofillSelection(
772 const blink::WebNode& node) { 792 const blink::WebNode& node) {
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1430 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::DidStopLoading() { 1450 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::DidStopLoading() {
1431 agent_->DidStopLoading(); 1451 agent_->DidStopLoading();
1432 } 1452 }
1433 1453
1434 void PasswordAutofillAgent::LegacyPasswordAutofillAgent:: 1454 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::
1435 DidStartProvisionalLoad(blink::WebLocalFrame* navigated_frame) { 1455 DidStartProvisionalLoad(blink::WebLocalFrame* navigated_frame) {
1436 agent_->LegacyDidStartProvisionalLoad(navigated_frame); 1456 agent_->LegacyDidStartProvisionalLoad(navigated_frame);
1437 } 1457 }
1438 1458
1439 } // namespace autofill 1459 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698