From f1b7fe47bddde1b9a0a1646dc2f1f78705169e05 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 20 Oct 2010 14:16:14 +0100 Subject: Fix AutoFill after merge to Chromium merge to 7.0.540.0 Chromium now seems to enforce that profile unique ids cannot be zero (as the default ctor leaves them). Read the correct id from the Java WebSettings.AutoFillProfile class. Requires a corresponding change in frameworks/base: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f. Change-Id: I736220dccd8d68c395d6742e38a063da4140a13b --- WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp | 7 ++++--- WebKit/android/WebCoreSupport/autofill/WebAutoFill.h | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'WebKit/android/WebCoreSupport/autofill') diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp index 157a58a..ed42c7a 100644 --- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp +++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp @@ -162,11 +162,12 @@ bool WebAutoFill::enabled() const return page ? page->settings()->autoFillEnabled() : false; } -void WebAutoFill::setProfile(const string16& fullName, const string16& emailAddress, const string16& companyName, const string16& addressLine1, - const string16& addressLine2, const string16& city, const string16& state, const string16& zipCode, - const string16& country, const string16& phoneNumber) +void WebAutoFill::setProfile(int id, const string16& fullName, const string16& emailAddress, const string16& companyName, + const string16& addressLine1, const string16& addressLine2, const string16& city, + const string16& state, const string16& zipCode, const string16& country, const string16& phoneNumber) { AutoFillProfile autoFillProfile; + autoFillProfile.set_unique_id(id); // Constants for AutoFill field types are found in external/chromium/chrome/browser/autofill/field_types.h. autoFillProfile.SetInfo(AutoFillType(NAME_FULL), fullName); diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h index f5b2c68..46850e6 100644 --- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h +++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h @@ -63,9 +63,9 @@ public: void setWebViewCore(WebViewCore* webViewCore) { mWebViewCore = webViewCore; } bool enabled() const; - void setProfile(const string16& fullName, const string16& emailAddress, const string16& companyName, const string16& addressLine1, - const string16& addressLine2, const string16& city, const string16& state, const string16& zipCode, - const string16& country, const string16& phoneNumber); + void setProfile(int id, const string16& fullName, const string16& emailAddress, const string16& companyName, + const string16& addressLine1, const string16& addressLine2, const string16& city, + const string16& state, const string16& zipCode, const string16& country, const string16& phoneNumber); private: OwnPtr mFormManager; -- cgit v1.1