summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-26 11:40:11 +0000
committerBen Murdoch <benm@google.com>2010-12-03 15:08:24 +0000
commite186320c213f795c797868d42d4289bd0f1f86c4 (patch)
tree38d6c3e4ba0987457c972cc844df221209374702 /WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
parent82f247bdbb98dd80c44209d87692c650c3704617 (diff)
downloadexternal_webkit-e186320c213f795c797868d42d4289bd0f1f86c4.zip
external_webkit-e186320c213f795c797868d42d4289bd0f1f86c4.tar.gz
external_webkit-e186320c213f795c797868d42d4289bd0f1f86c4.tar.bz2
Merge Chromium at r66597: AutoFill: no more queryId
See http://src.chromium.org/viewvc/chrome?view=rev&revision=66237 Change-Id: Ie2bf417bf20686ca782f6c0e4d2527e666c88ad4
Diffstat (limited to 'WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp')
-rw-r--r--WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
index 2d92b4b..4fa0e54 100644
--- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
+++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
@@ -122,7 +122,7 @@ void WebAutoFill::formFieldFocused(WebCore::HTMLFormControlElement* formFieldEle
mFormManager->FindFormWithFormControlElement(formFieldElement, FormManager::REQUIRE_AUTOCOMPLETE, form);
mQueryMap[mQueryId] = form;
- bool suggestions = mAutoFillManager->GetAutoFillSuggestions(mQueryId, false, formField);
+ bool suggestions = mAutoFillManager->GetAutoFillSuggestions(false, formField);
mQueryId++;
if (!suggestions) {
ASSERT(mWebViewCore);
@@ -132,17 +132,17 @@ void WebAutoFill::formFieldFocused(WebCore::HTMLFormControlElement* formFieldEle
}
}
-void WebAutoFill::querySuccessful(int queryId, const string16& value, const string16& label, int uniqueId)
+void WebAutoFill::querySuccessful(const string16& value, const string16& label, int uniqueId)
{
if (!enabled())
return;
// Store the unique ID for the query and inform java that autofill suggestions for this form are available.
// Pass java the queryId so that it can pass it back if the user decides to use autofill.
- mUniqueIdMap[queryId] = uniqueId;
+ mUniqueIdMap[mQueryId] = uniqueId;
ASSERT(mWebViewCore);
- mWebViewCore->setWebTextViewAutoFillable(queryId, mAutoFillProfile->Label());
+ mWebViewCore->setWebTextViewAutoFillable(mQueryId, mAutoFillProfile->Label());
}
void WebAutoFill::fillFormFields(int queryId)