summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-07-08 04:29:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-08 04:29:33 -0700
commit2eeda689af37cb0b465ec195bce9ba559f73c521 (patch)
tree9530f98f36b0193d8310cfa572557c51df859735 /Source
parentf3b3fa3e527930db3cfb4fc3af538ac3512018fe (diff)
parent3bbdf589ce4def67f6fa976a6f7b310ed61baff1 (diff)
downloadexternal_webkit-2eeda689af37cb0b465ec195bce9ba559f73c521.zip
external_webkit-2eeda689af37cb0b465ec195bce9ba559f73c521.tar.gz
external_webkit-2eeda689af37cb0b465ec195bce9ba559f73c521.tar.bz2
Merge "Delete a JNI local ref in WebViewCore::openFileChooser()"
Diffstat (limited to 'Source')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 966a540..1c51b14 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -2971,16 +2971,11 @@ void WebViewCore::openFileChooser(PassRefPtr<WebCore::FileChooser> chooser)
checkException(env);
env->DeleteLocalRef(jAcceptType);
- const UChar* string = static_cast<const UChar*>(env->GetStringChars(jName, 0));
+ WTF::String wtfString = jstringToWtfString(env, jName);
+ env->DeleteLocalRef(jName);
- if (!string)
- return;
-
- WTF::String webcoreString = jstringToWtfString(env, jName);
- env->ReleaseStringChars(jName, string);
-
- if (webcoreString.length())
- chooser->chooseFile(webcoreString);
+ if (!wtfString.isEmpty())
+ chooser->chooseFile(wtfString);
}
void WebViewCore::listBoxRequest(WebCoreReply* reply, const uint16_t** labels, size_t count, const int enabled[], size_t enabledCount,