summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 05:40:53 +0000
committeraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 05:40:53 +0000
commitbfcade631b388e9718d7f48a571eff03d931304e (patch)
tree55dcfd2cc8d99fec82b5a2697b6fda0154184b9d
parenteda61dce04a8b2a9c15cf5f8bbbe099c95511d38 (diff)
downloadchromium_src-bfcade631b388e9718d7f48a571eff03d931304e.zip
chromium_src-bfcade631b388e9718d7f48a571eff03d931304e.tar.gz
chromium_src-bfcade631b388e9718d7f48a571eff03d931304e.tar.bz2
Upstreaming autofill changes for Android
BUG=138235 Review URL: https://chromiumcodereview.appspot.com/10855201 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161301 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/autofill/autofill_agent.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index bd574c0..3977caa 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -253,6 +253,10 @@ void AutofillAgent::didAcceptAutofillSuggestion(const WebNode& node,
break;
case WebAutofillClient::MenuItemIDAutocompleteEntry:
case WebAutofillClient::MenuItemIDPasswordEntry:
+#if defined(OS_ANDROID)
+ // Clear the current IME composition (the underline), if there is one.
+ node.document().frame()->unmarkText();
+#endif
// User selected an Autocomplete or password entry, so we fill directly.
SetNodeText(value, &element_);
break;
@@ -260,6 +264,10 @@ void AutofillAgent::didAcceptAutofillSuggestion(const WebNode& node,
AcceptDataListSuggestion(value);
break;
default:
+#if defined(OS_ANDROID)
+ // Clear the current IME composition (the underline), if there is one.
+ node.document().frame()->unmarkText();
+#endif
// A positive item_id is a unique id for an autofill (vs. autocomplete)
// suggestion.
DCHECK_GT(item_id, 0);