diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:00 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:00 -0800 |
commit | 498e5e4ad10920a9cfae6fdb7ffb19a6ed936ba7 (patch) | |
tree | 13d9b7c37da5daa52b9a744a11e4660c7f6aa917 /WebKit/android/jni/WebHistory.cpp | |
parent | f7e76168422a049a356179665d34ddfb74184920 (diff) | |
download | external_webkit-498e5e4ad10920a9cfae6fdb7ffb19a6ed936ba7.zip external_webkit-498e5e4ad10920a9cfae6fdb7ffb19a6ed936ba7.tar.gz external_webkit-498e5e4ad10920a9cfae6fdb7ffb19a6ed936ba7.tar.bz2 |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'WebKit/android/jni/WebHistory.cpp')
-rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 028d62e..8a75230 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -231,10 +231,7 @@ jbyteArray WebHistory::Flatten(JNIEnv* env, WTF::Vector<char>& v, WebCore::Histo return NULL; // Write our flattened data to the java array. - jbyte* bytes = env->GetByteArrayElements(b, NULL); - if (bytes) - memcpy(bytes, v.data(), v.size()); - env->ReleaseByteArrayElements(b, bytes, 0); + env->SetByteArrayRegion(b, 0, v.size(), (const jbyte*)v.data()); return b; } |