Allow only a user gesture to trigger autofill popup

components/autofill/content/renderer/autofill_agent.cc

Index: components/autofill/content/renderer/autofill_agent.cc
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 31068330ae94793b6238892e9bc27b57bc7ca8d7..3a655a7fc499852649171ce27f7246afd4897e17 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -43,6 +43,7 @@
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebOptionElement.h"
 #include "third_party/WebKit/public/web/WebTextAreaElement.h"
+#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -62,6 +63,7 @@ using blink::WebNode;
 using blink::WebOptionElement;
 using blink::WebString;
 using blink::WebTextAreaElement;
+using blink::WebUserGestureIndicator;
 using blink::WebVector;
 
 namespace autofill {
@@ -381,6 +383,9 @@ void AutofillAgent::textFieldDidChange(const WebFormControlElement& element) {
   if (ignore_text_changes_)
     return;
 
+  if (!WebUserGestureIndicator::isProcessingUserGesture())
+    return;
+
   DCHECK(toWebInputElement(&element) || IsTextAreaElement(element));
 
   if (did_set_node_text_) {
@@ -388,9 +393,10 @@ void AutofillAgent::textFieldDidChange(const WebFormControlElement& element) {
     return;
   }
 
-  // We post a task for doing the Autofill as the caret position is not set
-  // properly at this point (http://bugs.webkit.org/show_bug.cgi?id=16976) and
-  // it is needed to trigger autofill.
+  // We post a task for doing the Autofill as the caret position
+  // (http://bugs.webkit.org/show_bug.cgi?id=16976) and IME composition are not
+  // set properly at this point and this information is needed to trigger
+  // autofill.
   weak_ptr_factory_.InvalidateWeakPtrs();
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
@@ -406,6 +412,13 @@ void AutofillAgent::TextFieldDidChangeImpl(
   if (!element.focused())
     return;
 
+#if !defined(OS_ANDROID)
+  // IME composition on desktop is used for CJK, which will overlap with

[Evan Stade, 2015/04/17 20:58:58]

hmm, wouldn't we need to hide any pre-existing popup?

[please use gerrit instead, 2015/04/17 22:25:46]

Done.

+  // autofill popup near the input field.
+  if (render_frame()->GetWebFrame()->hasMarkedText())
+    return;
+#endif
+
   const WebInputElement* input_element = toWebInputElement(&element);
   if (input_element) {
     if (password_generation_agent_ &&