OLD | NEW |
---|---|
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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <string> | 10 #include <string> |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
696 const blink::WebInputElement* element = toWebInputElement(&control_element); | 696 const blink::WebInputElement* element = toWebInputElement(&control_element); |
697 if (!element) | 697 if (!element) |
698 return false; | 698 return false; |
699 | 699 |
700 blink::WebInputElement username_element; | 700 blink::WebInputElement username_element; |
701 blink::WebInputElement password_element; | 701 blink::WebInputElement password_element; |
702 PasswordInfo* password_info; | 702 PasswordInfo* password_info; |
703 | 703 |
704 if (!FindPasswordInfoForElement(*element, &username_element, | 704 if (!FindPasswordInfoForElement(*element, &username_element, |
705 &password_element, &password_info) || | 705 &password_element, &password_info) || |
706 (!username_element.isNull() && | |
707 !IsElementAutocompletable(username_element)) || | |
708 !IsElementAutocompletable(password_element)) { | 706 !IsElementAutocompletable(password_element)) { |
709 return false; | 707 return false; |
710 } | 708 } |
711 | 709 |
712 password_info->password_was_edited_last = false; | 710 password_info->password_was_edited_last = false; |
713 if (element->isPasswordField()) { | 711 if (element->isPasswordField()) { |
714 password_info->password_field_suggestion_was_accepted = true; | 712 password_info->password_field_suggestion_was_accepted = true; |
715 password_info->password_field = password_element; | 713 password_info->password_field = password_element; |
716 } else if (!username_element.isNull()) { | 714 } else if (!username_element.isNull()) { |
vabr (Chromium)
2016/09/07 08:32:53
Should we only execute this branch if also IsEleme
sense (YandexTeam)
2016/09/07 11:40:14
I think it's OK to add this check to exclude possi
vabr (Chromium)
2016/09/08 08:48:58
Ah, you are right, the first if-branch is used ins
| |
717 username_element.setValue(blink::WebString(username), true); | 715 username_element.setValue(blink::WebString(username), true); |
718 username_element.setAutofilled(true); | 716 username_element.setAutofilled(true); |
719 UpdateFieldValueAndPropertiesMaskMap(username_element, &username, | 717 UpdateFieldValueAndPropertiesMaskMap(username_element, &username, |
720 FieldPropertiesFlags::AUTOFILLED, | 718 FieldPropertiesFlags::AUTOFILLED, |
721 &field_value_and_properties_map_); | 719 &field_value_and_properties_map_); |
722 } | 720 } |
723 | 721 |
724 password_element.setValue(blink::WebString(password), true); | 722 password_element.setValue(blink::WebString(password), true); |
725 password_element.setAutofilled(true); | 723 password_element.setAutofilled(true); |
726 UpdateFieldValueAndPropertiesMaskMap(password_element, &password, | 724 UpdateFieldValueAndPropertiesMaskMap(password_element, &password, |
(...skipping 15 matching lines...) Expand all Loading... | |
742 const blink::WebInputElement* element = toWebInputElement(&control_element); | 740 const blink::WebInputElement* element = toWebInputElement(&control_element); |
743 if (!element) | 741 if (!element) |
744 return false; | 742 return false; |
745 | 743 |
746 blink::WebInputElement username_element; | 744 blink::WebInputElement username_element; |
747 blink::WebInputElement password_element; | 745 blink::WebInputElement password_element; |
748 PasswordInfo* password_info; | 746 PasswordInfo* password_info; |
749 | 747 |
750 if (!FindPasswordInfoForElement(*element, &username_element, | 748 if (!FindPasswordInfoForElement(*element, &username_element, |
751 &password_element, &password_info) || | 749 &password_element, &password_info) || |
752 (!username_element.isNull() && | |
753 !IsElementAutocompletable(username_element)) || | |
754 !IsElementAutocompletable(password_element)) { | 750 !IsElementAutocompletable(password_element)) { |
755 return false; | 751 return false; |
756 } | 752 } |
757 | 753 |
758 if (!element->isPasswordField() && !username_element.isNull()) { | 754 if (!element->isPasswordField() && !username_element.isNull()) { |
759 if (username_query_prefix_.empty()) | 755 if (username_query_prefix_.empty()) |
760 username_query_prefix_ = username_element.value(); | 756 username_query_prefix_ = username_element.value(); |
761 | 757 |
762 was_username_autofilled_ = username_element.isAutofilled(); | 758 was_username_autofilled_ = username_element.isAutofilled(); |
763 username_element.setSuggestedValue(username); | 759 username_element.setSuggestedValue(username); |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1493 !(provisionally_saved_form_->password_value.empty() && | 1489 !(provisionally_saved_form_->password_value.empty() && |
1494 provisionally_saved_form_->new_password_value.empty()); | 1490 provisionally_saved_form_->new_password_value.empty()); |
1495 } | 1491 } |
1496 | 1492 |
1497 const mojom::AutofillDriverPtr& PasswordAutofillAgent::GetAutofillDriver() { | 1493 const mojom::AutofillDriverPtr& PasswordAutofillAgent::GetAutofillDriver() { |
1498 DCHECK(autofill_agent_); | 1494 DCHECK(autofill_agent_); |
1499 return autofill_agent_->GetAutofillDriver(); | 1495 return autofill_agent_->GetAutofillDriver(); |
1500 } | 1496 } |
1501 | 1497 |
1502 } // namespace autofill | 1498 } // namespace autofill |
OLD | NEW |