summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-06-01 08:27:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-01 08:27:09 -0700
commitf3e429507eba1a13e9afaf436e240fd81797c646 (patch)
tree6cc693d3b4f38a6c326c424c3e79ba57e42cf8ab
parentc69907062387aaedf35962337b254c01893d398b (diff)
parent6b850721064920ae1ddb114964c5c2bb4a745532 (diff)
downloadexternal_webkit-f3e429507eba1a13e9afaf436e240fd81797c646.zip
external_webkit-f3e429507eba1a13e9afaf436e240fd81797c646.tar.gz
external_webkit-f3e429507eba1a13e9afaf436e240fd81797c646.tar.bz2
am 6b850721: Fixed mistake in how label was being mistakenly set into name.
* commit '6b850721064920ae1ddb114964c5c2bb4a745532': Fixed mistake in how label was being mistakenly set into name.
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 34a9485..5e0969f 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -3413,7 +3413,7 @@ jobject WebViewCore::createTextFieldInitData(Node* node)
env->SetObjectField(initData, classDef->m_name, fieldName.get());
ScopedLocalRef<jstring> label(env,
wtfStringToJstring(env, requestLabel(document->frame(), node), false));
- env->SetObjectField(initData, classDef->m_name, label.get());
+ env->SetObjectField(initData, classDef->m_label, label.get());
env->SetIntField(initData, classDef->m_maxLength, getMaxLength(node));
LayerAndroid* layer = 0;
int layerId = platformLayerIdFromNode(node, &layer);