[Android] Show autofill popup after animation.

components/autofill/content/renderer/autofill_agent.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/content/renderer/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
@@ skipping 196 matching lines @@
                                            base::TimeTicks::Now()));
   }
 }
 
 void AutofillAgent::DidChangeScrollOffset() {
   HidePopup();
 }
 
 void AutofillAgent::FocusedNodeChanged(const WebNode& node) {
   HidePopup();
+  element_.reset();

[Garrett Casto, 2015/01/06 20:01:09]

Is this safe? |element_| is mostly used to display information after
communication with the browser. It seems like this could race with that IPC and
possibly end up null. Admittedly while the current code wouldn't crash it would
be pointing to the wrong value which isn't ideal either. Philosophically this
seems to make more sense, but it seems like we need to add null checks
everywhere |element_| is used.

[please use gerrit instead, 2015/01/13 02:14:55]

On a second look, nulling |element_| is not required. I removed this change.

 
   if (node.isNull() || !node.isElementNode())
     return;
 
   if (node.document().frame() != render_frame()->GetWebFrame())
     return;
 
-  if (password_generation_agent_ &&
-      password_generation_agent_->FocusedNodeHasChanged(node)) {
-    is_popup_possibly_visible_ = true;
-    return;
-  }
-
   WebElement web_element = node.toConst<WebElement>();
 
   if (!web_element.document().frame())
     return;
 
   const WebInputElement* element = toWebInputElement(&web_element);
 
   if (!element || !element->isEnabled() || element->isReadOnly() ||
-      !element->isTextField() || element->isPasswordField())
+      !element->isTextField())
     return;
 
   element_ = *element;
 }
 
-void AutofillAgent::Resized() {
+void AutofillAgent::FocusedElementMovedOnResize() {
   HidePopup();
 }
 
+void AutofillAgent::FocusChangeComplete() {
+  if (!element_.isNull() && password_generation_agent_ &&
+      password_generation_agent_->FocusedNodeHasChanged(element_)) {
+    is_popup_possibly_visible_ = true;
+  }
+}
+
 void AutofillAgent::LegacyFrameWillClose(blink::WebFrame* frame) {
   if (in_flight_request_form_.isNull())
     return;
 
   for (blink::WebFrame* temp = render_frame()->GetWebFrame(); temp;
        temp = temp->parent()) {
     if (temp == frame) {
       Send(new AutofillHostMsg_CancelRequestAutocomplete(routing_id()));
       break;
     }
@@ skipping 72 matching lines @@
 
   ShowSuggestionsOptions options;
   options.autofill_on_empty_values = true;
   options.display_warning_if_disabled = true;
   options.show_full_suggestion_list = element.isAutofilled();
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSingleClickAutofill)) {
     // Show full suggestions when clicking on an already-focused form field. On
     // the initial click (not focused yet), only show password suggestions.
-#if defined(OS_ANDROID)
-    // TODO(gcasto): Remove after crbug.com/430318 has been fixed.
-    if (!was_focused)
-      return;
-#endif
-
     options.show_full_suggestion_list =
         options.show_full_suggestion_list || was_focused;
     options.show_password_suggestions_only = !was_focused;
   }
   ShowSuggestions(element, options);
 }
 
 void AutofillAgent::textFieldDidEndEditing(const WebInputElement& element) {
   password_autofill_agent_->TextFieldDidEndEditing(element);
   has_shown_autofill_popup_for_current_edit_ = false;
@@ skipping 447 matching lines @@
 
 void AutofillAgent::LegacyAutofillAgent::FrameDetached(WebFrame* frame) {
   agent_->FrameDetached(frame);
 }
 
 void AutofillAgent::LegacyAutofillAgent::FocusedNodeChanged(
     const WebNode& node) {
   agent_->FocusedNodeChanged(node);
 }
 
-void AutofillAgent::LegacyAutofillAgent::Resized() {
-  agent_->Resized();
+void AutofillAgent::LegacyAutofillAgent::FocusedElementMovedOnResize() {
+  agent_->FocusedElementMovedOnResize();
+}
+
+void AutofillAgent::LegacyAutofillAgent::FocusChangeComplete() {
+  agent_->FocusChangeComplete();
 }
 
 void AutofillAgent::LegacyAutofillAgent::FrameWillClose(
     blink::WebFrame* frame) {
   agent_->LegacyFrameWillClose(frame);
 }
 
 }  // namespace autofill