diff options
| author | Victoria Lease <violets@google.com> | 2012-05-24 11:51:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 11:51:35 -0700 |
| commit | 6b009e8771885fecef109c34e30b9d59e5ecaab9 (patch) | |
| tree | 5e0a547a8f42db923c4ac9e9f962a5a780ace860 /Source/WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | 1805ecfa9d1149489cecee2c07060f5aedba4aec (diff) | |
| parent | 284e9feef00d472eef6a2eb5757c85df23dd921a (diff) | |
| download | external_webkit-6b009e8771885fecef109c34e30b9d59e5ecaab9.zip external_webkit-6b009e8771885fecef109c34e30b9d59e5ecaab9.tar.gz external_webkit-6b009e8771885fecef109c34e30b9d59e5ecaab9.tar.bz2 | |
am 284e9fee: am c8d518ba: Merge "properly convert data from utf-16 to utf-8 in LoadData()" into jb-dev
* commit '284e9feef00d472eef6a2eb5757c85df23dd921a':
properly convert data from utf-16 to utf-8 in LoadData()
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index a9fa288..c03c288 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1288,12 +1288,12 @@ static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data, WebCore::ResourceRequest request(jstringToWtfString(env, baseUrl)); // Setup the substituteData - const char* dataStr = env->GetStringUTFChars(data, NULL); + WTF::CString cData = jstringToWtfString(env, data).utf8(); + const char* dataStr = cData.data(); WTF::RefPtr<WebCore::SharedBuffer> sharedBuffer = WebCore::SharedBuffer::create(); ALOG_ASSERT(dataStr, "nativeLoadData has a null data string."); - sharedBuffer->append(dataStr, strlen(dataStr)); - env->ReleaseStringUTFChars(data, dataStr); + sharedBuffer->append(dataStr, strlen(dataStr)); // copy dataStr WebCore::SubstituteData substituteData(sharedBuffer, jstringToWtfString(env, mimeType), jstringToWtfString(env, encoding), |