| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/android/jni_array.h" | 5 #include "base/android/jni_array.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 | 10 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 env->SetIntArrayRegion( | 47 env->SetIntArrayRegion( |
| 48 int_array, 0, len, reinterpret_cast<const jint*>(ints)); | 48 int_array, 0, len, reinterpret_cast<const jint*>(ints)); |
| 49 CheckException(env); | 49 CheckException(env); |
| 50 | 50 |
| 51 return ScopedJavaLocalRef<jintArray>(env, int_array); | 51 return ScopedJavaLocalRef<jintArray>(env, int_array); |
| 52 } | 52 } |
| 53 | 53 |
| 54 ScopedJavaLocalRef<jintArray> ToJavaIntArray( | 54 ScopedJavaLocalRef<jintArray> ToJavaIntArray( |
| 55 JNIEnv* env, const std::vector<int>& ints) { | 55 JNIEnv* env, const std::vector<int>& ints) { |
| 56 return ToJavaIntArray(env, ints.begin(), ints.size()); | 56 return ToJavaIntArray(env, ints.data(), ints.size()); |
| 57 } | 57 } |
| 58 | 58 |
| 59 ScopedJavaLocalRef<jlongArray> ToJavaLongArray( | 59 ScopedJavaLocalRef<jlongArray> ToJavaLongArray( |
| 60 JNIEnv* env, const int64* longs, size_t len) { | 60 JNIEnv* env, const int64* longs, size_t len) { |
| 61 jlongArray long_array = env->NewLongArray(len); | 61 jlongArray long_array = env->NewLongArray(len); |
| 62 CheckException(env); | 62 CheckException(env); |
| 63 DCHECK(long_array); | 63 DCHECK(long_array); |
| 64 | 64 |
| 65 env->SetLongArrayRegion( | 65 env->SetLongArrayRegion( |
| 66 long_array, 0, len, reinterpret_cast<const jlong*>(longs)); | 66 long_array, 0, len, reinterpret_cast<const jlong*>(longs)); |
| 67 CheckException(env); | 67 CheckException(env); |
| 68 | 68 |
| 69 return ScopedJavaLocalRef<jlongArray>(env, long_array); | 69 return ScopedJavaLocalRef<jlongArray>(env, long_array); |
| 70 } | 70 } |
| 71 | 71 |
| 72 // Returns a new Java long array converted from the given int64 array. | 72 // Returns a new Java long array converted from the given int64 array. |
| 73 BASE_EXPORT ScopedJavaLocalRef<jlongArray> ToJavaLongArray( | 73 BASE_EXPORT ScopedJavaLocalRef<jlongArray> ToJavaLongArray( |
| 74 JNIEnv* env, const std::vector<int64>& longs) { | 74 JNIEnv* env, const std::vector<int64>& longs) { |
| 75 return ToJavaLongArray(env, longs.begin(), longs.size()); | 75 return ToJavaLongArray(env, longs.data(), longs.size()); |
| 76 } | 76 } |
| 77 | 77 |
| 78 ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray( | 78 ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray( |
| 79 JNIEnv* env, const std::vector<std::string>& v) { | 79 JNIEnv* env, const std::vector<std::string>& v) { |
| 80 ScopedJavaLocalRef<jclass> byte_array_clazz = GetClass(env, "[B"); | 80 ScopedJavaLocalRef<jclass> byte_array_clazz = GetClass(env, "[B"); |
| 81 jobjectArray joa = env->NewObjectArray(v.size(), | 81 jobjectArray joa = env->NewObjectArray(v.size(), |
| 82 byte_array_clazz.obj(), NULL); | 82 byte_array_clazz.obj(), NULL); |
| 83 CheckException(env); | 83 CheckException(env); |
| 84 | 84 |
| 85 for (size_t i = 0; i < v.size(); ++i) { | 85 for (size_t i = 0; i < v.size(); ++i) { |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 env->GetObjectArrayElement(array, i))); | 220 env->GetObjectArrayElement(array, i))); |
| 221 jsize bytes_len = env->GetArrayLength(bytes_array.obj()); | 221 jsize bytes_len = env->GetArrayLength(bytes_array.obj()); |
| 222 jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), NULL); | 222 jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), NULL); |
| 223 (*out)[i].assign(reinterpret_cast<const char*>(bytes), bytes_len); | 223 (*out)[i].assign(reinterpret_cast<const char*>(bytes), bytes_len); |
| 224 env->ReleaseByteArrayElements(bytes_array.obj(), bytes, JNI_ABORT); | 224 env->ReleaseByteArrayElements(bytes_array.obj(), bytes, JNI_ABORT); |
| 225 } | 225 } |
| 226 } | 226 } |
| 227 | 227 |
| 228 } // namespace android | 228 } // namespace android |
| 229 } // namespace base | 229 } // namespace base |
| OLD | NEW |