diff options
author | Ben Murdoch <benm@google.com> | 2010-11-29 07:38:49 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-29 07:38:49 -0800 |
commit | a05ec2066d986ff15366f15b13cc1bef430d4ea1 (patch) | |
tree | 6d2672a74ad927f82dfd8c29ed7b03b06c559e8d | |
parent | 454adf027eb747dd9d6c6b041f1d2d68f228c44b (diff) | |
parent | 76036775fc94b450410ad65718831445859bd31d (diff) | |
download | external_webkit-a05ec2066d986ff15366f15b13cc1bef430d4ea1.zip external_webkit-a05ec2066d986ff15366f15b13cc1bef430d4ea1.tar.gz external_webkit-a05ec2066d986ff15366f15b13cc1bef430d4ea1.tar.bz2 |
Merge "AutoFill no longer needs a unique profile id native side."
-rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index adee9d8..737f107 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -129,7 +129,6 @@ struct FieldIds { mAutoFillEnabled = env->GetFieldID(clazz, "mAutoFillEnabled", "Z"); mAutoFillProfile = env->GetFieldID(clazz, "mAutoFillProfile", "Landroid/webkit/WebSettings$AutoFillProfile;"); jclass autoFillProfileClass = env->FindClass("android/webkit/WebSettings$AutoFillProfile"); - mAutoFillProfileUniqueId = env->GetFieldID(autoFillProfileClass, "mUniqueId", "I"); mAutoFillProfileFullName = env->GetFieldID(autoFillProfileClass, "mFullName", "Ljava/lang/String;"); mAutoFillProfileEmailAddress = env->GetFieldID(autoFillProfileClass, "mEmailAddress", "Ljava/lang/String;"); mAutoFillProfileCompanyName = env->GetFieldID(autoFillProfileClass, "mCompanyName", "Ljava/lang/String;"); @@ -254,7 +253,6 @@ struct FieldIds { #if ENABLE(WEB_AUTOFILL) jfieldID mAutoFillEnabled; jfieldID mAutoFillProfile; - jfieldID mAutoFillProfileUniqueId; jfieldID mAutoFillProfileFullName; jfieldID mAutoFillProfileEmailAddress; jfieldID mAutoFillProfileCompanyName; @@ -291,8 +289,6 @@ inline string16 getStringFieldAsString16(JNIEnv* env, jobject autoFillProfile, j void syncAutoFillProfile(JNIEnv* env, jobject autoFillProfile, WebAutoFill* webAutoFill) { - // FIXME: id is deprecated. - int id = env->GetIntField(autoFillProfile, gFieldIds->mAutoFillProfileUniqueId); string16 fullName = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileFullName); string16 emailAddress = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileEmailAddress); string16 companyName = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileCompanyName); |