Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dependency on jniGetNonMovableArrayElements."

Browse Source
This commit is contained in:
Elliott Hughes
2013-10-18 18:01:12 +00:00
committed by Gerrit Code Review
parent 7878883ed9 7384b428c4
commit ac6e036a78
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/jni/android/graphics/Graphics.cpp
View File

@@ -172,6 +172,12 @@ static jclass gRegion_class;
static jfieldID gRegion_nativeInstanceID; static jfieldID gRegion_nativeInstanceID;
static jmethodID gRegion_constructorMethodID; static jmethodID gRegion_constructorMethodID;
static jclass gByte_class;
static jobject gVMRuntime;
static jclass gVMRuntime_class;
static jmethodID gVMRuntime_newNonMovableArray;
static jmethodID gVMRuntime_addressOf;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
void GraphicsJNI::get_jrect(JNIEnv* env, jobject obj, int* L, int* T, int* R, int* B) void GraphicsJNI::get_jrect(JNIEnv* env, jobject obj, int* L, int* T, int* R, int* B)
@@ -476,8 +482,6 @@ void AndroidPixelRef::globalUnref() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
extern "C" jbyte* jniGetNonMovableArrayElements(C_JNIEnv* env, jarray arrayObj);
jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap, jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
SkColorTable* ctable) { SkColorTable* ctable) {
Sk64 size64 = bitmap->getSize64(); Sk64 size64 = bitmap->getSize64();
@@ -486,12 +490,12 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
"bitmap size exceeds 32bits"); "bitmap size exceeds 32bits");
return NULL; return NULL;
} }
size_t size = size64.get32(); size_t size = size64.get32();
jbyteArray arrayObj = env->NewByteArray(size); jbyteArray arrayObj = (jbyteArray) env->CallObjectMethod(gVMRuntime,
gVMRuntime_newNonMovableArray,
gByte_class, size);
if (arrayObj) { if (arrayObj) {
// TODO: make this work without jniGetNonMovableArrayElements jbyte* addr = (jbyte*)env->CallLongMethod(gVMRuntime, gVMRuntime_addressOf, arrayObj);
jbyte* addr = jniGetNonMovableArrayElements(&env->functions, arrayObj);
if (addr) { if (addr) {
SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable); SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable);
bitmap->setPixelRef(pr)->unref(); bitmap->setPixelRef(pr)->unref();
@@ -609,5 +613,16 @@ int register_android_graphics_Graphics(JNIEnv* env)
gRegion_constructorMethodID = env->GetMethodID(gRegion_class, "<init>", gRegion_constructorMethodID = env->GetMethodID(gRegion_class, "<init>",
"(II)V"); "(II)V");
c = env->FindClass("java/lang/Byte");
gByte_class = (jclass)env->NewGlobalRef(
env->GetStaticObjectField(c, env->GetStaticFieldID(c, "TYPE", "Ljava/lang/Class;")));
gVMRuntime_class = make_globalref(env, "dalvik/system/VMRuntime");
m = env->GetStaticMethodID(gVMRuntime_class, "getRuntime", "()Ldalvik/system/VMRuntime;");
gVMRuntime = env->NewGlobalRef(env->CallStaticObjectMethod(gVMRuntime_class, m));
gVMRuntime_newNonMovableArray = env->GetMethodID(gVMRuntime_class, "newNonMovableArray",
"(Ljava/lang/Class;I)Ljava/lang/Object;");
gVMRuntime_addressOf = env->GetMethodID(gVMRuntime_class, "addressOf", "(Ljava/lang/Object;)J");
return 0; return 0;
} }