diff options
author | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:58:00 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-14 20:58:00 -0700 |
commit | 56793b97e67f4ec1e4191836ed00e0a4267fb598 (patch) | |
tree | fdbb2f88e9707cb4d096fbfcb36f89404037df9b /Source/WebKit/android/WebCoreSupport/autofill | |
parent | 88915f520227e3fed8972bc1d407ebae6daf32c4 (diff) | |
parent | 38adb29091367817a357decc44dcd186bf428f45 (diff) | |
download | external_webkit-56793b97e67f4ec1e4191836ed00e0a4267fb598.zip external_webkit-56793b97e67f4ec1e4191836ed00e0a4267fb598.tar.gz external_webkit-56793b97e67f4ec1e4191836ed00e0a4267fb598.tar.bz2 |
Merge changes I637b26fb,Icf028ea9
* changes:
Merge Chromium at r11.0.672.0: Fix autofill
Merge Chromium at r11.0.672.0: Compile fixes
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/autofill')
-rw-r--r-- | Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp index a80636c..961497b 100644 --- a/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp +++ b/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp @@ -122,7 +122,7 @@ void WebAutoFill::searchDocument(WebCore::Frame* frame) void WebAutoFill::formsSeenImpl() { MutexLocker lock(mFormsSeenMutex); - mAutoFillManager->FormsSeen(mForms); + mAutoFillManager->OnFormsSeenWrapper(mForms); mParsingForms = false; mFormsSeenCondition.signal(); } @@ -166,7 +166,7 @@ void WebAutoFill::formFieldFocused(WebCore::HTMLFormControlElement* formFieldEle mFormManager->FindFormWithFormControlElement(formFieldElement, FormManager::REQUIRE_AUTOCOMPLETE, form); mQueryMap[mQueryId] = new FormDataAndField(form, formField); - bool suggestions = mAutoFillManager->GetAutoFillSuggestions(*form, *formField); + bool suggestions = mAutoFillManager->OnQueryFormFieldAutoFillWrapper(0, *form, *formField); // First param not used on Android mQueryId++; if (!suggestions) { @@ -207,7 +207,7 @@ void WebAutoFill::fillFormFields(int queryId) // but stop here to be certain. return; } - mAutoFillManager->FillAutoFillFormData(queryId, *form, *field, iter->second); + mAutoFillManager->OnFillAutoFillFormDataWrapper(queryId, *form, *field, iter->second); mUniqueIdMap.erase(iter); } |