diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-07 16:19:24 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-08 15:39:29 +0100 |
| commit | 38adb29091367817a357decc44dcd186bf428f45 (patch) | |
| tree | 9113ebffeb9e94ea1acbb914c375d2bd22a0a95a | |
| parent | e4a6ca290c7810f10ff4fc136a07db2149422492 (diff) | |
| download | external_webkit-38adb29091367817a357decc44dcd186bf428f45.zip external_webkit-38adb29091367817a357decc44dcd186bf428f45.tar.gz external_webkit-38adb29091367817a357decc44dcd186bf428f45.tar.bz2 | |
Merge Chromium at r11.0.672.0: Fix autofill
Major refactoring in CL:
http://codereview.chromium.org/5958021
Created wrapper function to call in chromium CL:
https://android-git.corp.google.com/g/#change,113980
Change-Id: I637b26fb2e3ccb544adfc818b94047ef5a2c5aad
| -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); } |