Password autofill should not override explicitly typed password

components/autofill/content/renderer/password_autofill_agent.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 
 #include <map>
+#include <set>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 
 namespace blink {
 class WebInputElement;
@@ skipping 65 matching lines @@
     OTHER_POSSIBLE_USERNAMES_MAX
   };
 
   struct PasswordInfo {
     blink::WebInputElement password_field;
     PasswordFormFillData fill_data;
     bool backspace_pressed_last;
     PasswordInfo() : backspace_pressed_last(false) {}
   };
   typedef std::map<blink::WebElement, PasswordInfo> LoginToPasswordInfoMap;
+  typedef std::map<blink::WebElement, blink::WebElement> PasswordToLoginMap;
   typedef std::map<blink::WebFrame*,
                    linked_ptr<PasswordForm> > FrameToPasswordFormMap;
 
   // This class holds a vector of autofilled password input elements and makes
   // sure the autofilled password value is not accessible to JavaScript code
   // until the user interacts with the page.
   class PasswordValueGatekeeper {
    public:
     PasswordValueGatekeeper();
     ~PasswordValueGatekeeper();
@@ skipping 87 matching lines @@
   void ClearPreview(blink::WebInputElement* username,
                     blink::WebInputElement* password);
 
   // If |provisionally_saved_forms_| contains a form for |current_frame| or its
   // children, return such frame.
   blink::WebFrame* CurrentOrChildFrameWithSavedForms(
       const blink::WebFrame* current_frame);
 
   // The logins we have filled so far with their associated info.
   LoginToPasswordInfoMap login_to_password_info_;
+  PasswordToLoginMap password_to_username_;
 
   // Used for UMA stats.
   OtherPossibleUsernamesUsage usernames_usage_;
 
   // Pointer to the WebView. Used to access page scale factor.
   blink::WebView* web_view_;
 
   // Set if the user might be submitting a password form on the current page,
   // but the submit may still fail (i.e. doesn't pass JavaScript validation).
   FrameToPasswordFormMap provisionally_saved_forms_;
 
   PasswordValueGatekeeper gatekeeper_;
 
   // True indicates that user debug information should be logged.
   bool logging_state_active_;
 
   // True indicates that the username field was autofilled, false otherwise.
   bool was_username_autofilled_;
   // True indicates that the password field was autofilled, false otherwise.
   bool was_password_autofilled_;
 
   // Records original starting point of username element's selection range
   // before preview.
   int username_selection_start_;
 
   // True indicates that all frames in a page have been rendered.
   bool did_stop_loading_;
 
+  // The set of all username elements, for which the corresponding password

[engedy, 2014/07/29 14:43:54]

As discussed offline, we should just add this to PasswordInfo.

[vabr (Chromium), 2014/07/29 15:12:30]

Done.

+  // fields should not be filled at the moment. This includes cases, where the
+  // user chose a suggestion, then changed the filled password, then entered and
+  // left the username field again without change.
+  std::set<blink::WebElement> temporary_disabled_password_fill_;
+
   base::WeakPtrFactory<PasswordAutofillAgent> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordAutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_