Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c20c389 authored by Chris Craik's avatar Chris Craik
Browse files

Use global references for Bitmap AndroidPixelRefs 

bug:9621717

Because we're no longer holding onto Bitmaps Java side during
DisplayList lifetime, use global refs to keep the backing byte arrays
around.

Adds back bitmap buffer passing + native ref management removed by
3b748a44

Adds back globalRef-ing removed by
f890fab5

Change-Id: Ia59ba42f05bea6165aec2b800619221a8083d580
parent e969964c

core/java/android/view/GLES20Canvas.java

+15 −13
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ class GLES20Canvas extends HardwareCanvas { 
        int modifier = paint != null ? setupColorFilter(paint) : MODIFIER_NONE;

        try {

            final int nativePaint = paint == null ? 0 : paint.mNativePaint;

            nDrawPatch(mRenderer, bitmap.mNativeBitmap, patch.mNativeChunk,

            nDrawPatch(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, patch.mNativeChunk,

                    dst.left, dst.top, dst.right, dst.bottom, nativePaint);

        } finally {

            if (modifier != MODIFIER_NONE) nResetModifiers(mRenderer, modifier);
@@ -796,14 +796,14 @@ class GLES20Canvas extends HardwareCanvas { 
        int modifier = paint != null ? setupColorFilter(paint) : MODIFIER_NONE;

        try {

            final int nativePaint = paint == null ? 0 : paint.mNativePaint;

            nDrawPatch(mRenderer, bitmap.mNativeBitmap, patch.mNativeChunk,

            nDrawPatch(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, patch.mNativeChunk,

                    dst.left, dst.top, dst.right, dst.bottom, nativePaint);

        } finally {

            if (modifier != MODIFIER_NONE) nResetModifiers(mRenderer, modifier);

        }

    }



    private static native void nDrawPatch(int renderer, int bitmap, int chunk,

    private static native void nDrawPatch(int renderer, int bitmap, byte[] buffer, int chunk,

            float left, float top, float right, float bottom, int paint);



    @Override
@@ -813,13 +813,13 @@ class GLES20Canvas extends HardwareCanvas { 
        int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE;

        try {

            final int nativePaint = paint == null ? 0 : paint.mNativePaint;

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, left, top, nativePaint);

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, left, top, nativePaint);

        } finally {

            if (modifiers != MODIFIER_NONE) nResetModifiers(mRenderer, modifiers);

        }

    }



    private static native void nDrawBitmap(int renderer, int bitmap,

    private static native void nDrawBitmap(int renderer, int bitmap, byte[] buffer,

            float left, float top, int paint);



    @Override
@@ -829,13 +829,15 @@ class GLES20Canvas extends HardwareCanvas { 
        int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE;

        try {

            final int nativePaint = paint == null ? 0 : paint.mNativePaint;

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap,  matrix.native_instance, nativePaint);

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer,

                    matrix.native_instance, nativePaint);

        } finally {

            if (modifiers != MODIFIER_NONE) nResetModifiers(mRenderer, modifiers);

        }

    }



    private static native void nDrawBitmap(int renderer, int bitmap, int matrix, int paint);

    private static native void nDrawBitmap(int renderer, int bitmap, byte[] buffer,

            int matrix, int paint);



    @Override

    public void drawBitmap(Bitmap bitmap, Rect src, Rect dst, Paint paint) {
@@ -857,7 +859,7 @@ class GLES20Canvas extends HardwareCanvas { 
                bottom = src.bottom;

            }



            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, left, top, right, bottom,

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, left, top, right, bottom,

                    dst.left, dst.top, dst.right, dst.bottom, nativePaint);

        } finally {

            if (modifiers != MODIFIER_NONE) nResetModifiers(mRenderer, modifiers);
@@ -884,14 +886,14 @@ class GLES20Canvas extends HardwareCanvas { 
                bottom = src.bottom;

            }

    

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, left, top, right, bottom,

            nDrawBitmap(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, left, top, right, bottom,

                    dst.left, dst.top, dst.right, dst.bottom, nativePaint);

        } finally {

            if (modifiers != MODIFIER_NONE) nResetModifiers(mRenderer, modifiers);

        }

    }



    private static native void nDrawBitmap(int renderer, int bitmap,

    private static native void nDrawBitmap(int renderer, int bitmap, byte[] buffer,

            float srcLeft, float srcTop, float srcRight, float srcBottom,

            float left, float top, float right, float bottom, int paint);
@@ -961,14 +963,14 @@ class GLES20Canvas extends HardwareCanvas { 
        int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE;

        try {

            final int nativePaint = paint == null ? 0 : paint.mNativePaint;

            nDrawBitmapMesh(mRenderer, bitmap.mNativeBitmap, meshWidth, meshHeight,

            nDrawBitmapMesh(mRenderer, bitmap.mNativeBitmap, bitmap.mBuffer, meshWidth, meshHeight,

                    verts, vertOffset, colors, colorOffset, nativePaint);

        } finally {

            if (modifiers != MODIFIER_NONE) nResetModifiers(mRenderer, modifiers);

        }

    }



    private static native void nDrawBitmapMesh(int renderer, int bitmap,

    private static native void nDrawBitmapMesh(int renderer, int bitmap, byte[] buffer,

            int meshWidth, int meshHeight, float[] verts, int vertOffset,

            int[] colors, int colorOffset, int paint);

core/jni/android_view_GLES20Canvas.cpp

+29 −11
Original line number Diff line number Diff line
@@ -377,20 +377,31 @@ static void android_view_GLES20Canvas_concatMatrix(JNIEnv* env, jobject clazz, 
// ----------------------------------------------------------------------------



static void android_view_GLES20Canvas_drawBitmap(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer, SkBitmap* bitmap, jfloat left, jfloat top, SkPaint* paint) {

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer,

        jfloat left, jfloat top, SkPaint* paint) {

    // This object allows the renderer to allocate a global JNI ref to the buffer object.

    JavaHeapBitmapRef bitmapRef(env, bitmap, buffer);



    renderer->drawBitmap(bitmap, left, top, paint);

}



static void android_view_GLES20Canvas_drawBitmapRect(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer, SkBitmap* bitmap,

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer,

        float srcLeft, float srcTop, float srcRight, float srcBottom,

        float dstLeft, float dstTop, float dstRight, float dstBottom, SkPaint* paint) {

    // This object allows the renderer to allocate a global JNI ref to the buffer object.

    JavaHeapBitmapRef bitmapRef(env, bitmap, buffer);



    renderer->drawBitmap(bitmap, srcLeft, srcTop, srcRight, srcBottom,

            dstLeft, dstTop, dstRight, dstBottom, paint);

}



static void android_view_GLES20Canvas_drawBitmapMatrix(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer, SkBitmap* bitmap, SkMatrix* matrix, SkPaint* paint) {

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer,

        SkMatrix* matrix, SkPaint* paint) {

    // This object allows the renderer to allocate a global JNI ref to the buffer object.

    JavaHeapBitmapRef bitmapRef(env, bitmap, buffer);



    renderer->drawBitmap(bitmap, matrix, paint);

}
@@ -420,8 +431,12 @@ static void android_view_GLES20Canvas_drawBitmapData(JNIEnv* env, jobject clazz, 
}



static void android_view_GLES20Canvas_drawBitmapMesh(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer, SkBitmap* bitmap, jint meshWidth, jint meshHeight,

         jfloatArray vertices, jint offset, jintArray colors, jint colorOffset, SkPaint* paint) {

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer,

        jint meshWidth, jint meshHeight, jfloatArray vertices, jint offset, jintArray colors,

        jint colorOffset, SkPaint* paint) {

    // This object allows the renderer to allocate a global JNI ref to the buffer object.

    JavaHeapBitmapRef bitmapRef(env, bitmap, buffer);



    jfloat* verticesArray = vertices ? env->GetFloatArrayElements(vertices, NULL) + offset : NULL;

    jint* colorsArray = colors ? env->GetIntArrayElements(colors, NULL) + colorOffset : NULL;
@@ -432,8 +447,11 @@ static void android_view_GLES20Canvas_drawBitmapMesh(JNIEnv* env, jobject clazz, 
}



static void android_view_GLES20Canvas_drawPatch(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer, SkBitmap* bitmap, Res_png_9patch* patch,

        OpenGLRenderer* renderer, SkBitmap* bitmap, jbyteArray buffer, Res_png_9patch* patch,

        float left, float top, float right, float bottom, SkPaint* paint) {

    // This object allows the renderer to allocate a global JNI ref to the buffer object.

    JavaHeapBitmapRef bitmapRef(env, bitmap, buffer);



    renderer->drawPatch(bitmap, patch, left, top, right, bottom, paint);

}
@@ -1018,14 +1036,14 @@ static JNINativeMethod gMethods[] = { 
    { "nGetMatrix",         "(II)V",           (void*) android_view_GLES20Canvas_getMatrix },

    { "nConcatMatrix",      "(II)V",           (void*) android_view_GLES20Canvas_concatMatrix },



    { "nDrawBitmap",        "(IIFFI)V",        (void*) android_view_GLES20Canvas_drawBitmap },

    { "nDrawBitmap",        "(IIFFFFFFFFI)V",  (void*) android_view_GLES20Canvas_drawBitmapRect },

    { "nDrawBitmap",        "(IIII)V",         (void*) android_view_GLES20Canvas_drawBitmapMatrix },

    { "nDrawBitmap",        "(II[BFFI)V",      (void*) android_view_GLES20Canvas_drawBitmap },

    { "nDrawBitmap",        "(II[BFFFFFFFFI)V",(void*) android_view_GLES20Canvas_drawBitmapRect },

    { "nDrawBitmap",        "(II[BII)V",       (void*) android_view_GLES20Canvas_drawBitmapMatrix },

    { "nDrawBitmap",        "(I[IIIFFIIZI)V",  (void*) android_view_GLES20Canvas_drawBitmapData },



    { "nDrawBitmapMesh",    "(IIII[FI[III)V",  (void*) android_view_GLES20Canvas_drawBitmapMesh },

    { "nDrawBitmapMesh",    "(II[BII[FI[III)V",(void*) android_view_GLES20Canvas_drawBitmapMesh },



    { "nDrawPatch",         "(IIIFFFFI)V",     (void*) android_view_GLES20Canvas_drawPatch },

    { "nDrawPatch",         "(II[BIFFFFI)V",   (void*) android_view_GLES20Canvas_drawPatch },



    { "nDrawColor",         "(III)V",          (void*) android_view_GLES20Canvas_drawColor },

    { "nDrawRect",          "(IFFFFI)V",       (void*) android_view_GLES20Canvas_drawRect },

graphics/java/android/graphics/Bitmap.java

+5 −1
Original line number Diff line number Diff line
@@ -45,9 +45,13 @@ public final class Bitmap implements Parcelable { 


    /**

     * Backing buffer for the Bitmap.

     * Made public for quick access from drawing methods -- do NOT modify

     * from outside this class

     *

     * @hide

     */

    @SuppressWarnings("UnusedDeclaration") // native code only

    private byte[] mBuffer;

    public byte[] mBuffer;



    @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) // Keep to finalize native resources

    private final BitmapFinalizer mFinalizer;

libs/hwui/ResourceCache.cpp

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void ResourceCache::incrementRefcount(void* resource, ResourceType resourceType) 
}



void ResourceCache::incrementRefcount(SkBitmap* bitmapResource) {

    SkSafeRef(bitmapResource->pixelRef());

    bitmapResource->pixelRef()->globalRef();

    SkSafeRef(bitmapResource->getColorTable());

    incrementRefcount((void*) bitmapResource, kBitmap);

}
@@ -100,7 +100,7 @@ void ResourceCache::incrementRefcountLocked(void* resource, ResourceType resourc 
}



void ResourceCache::incrementRefcountLocked(SkBitmap* bitmapResource) {

    SkSafeRef(bitmapResource->pixelRef());

    bitmapResource->pixelRef()->globalRef();

    SkSafeRef(bitmapResource->getColorTable());

    incrementRefcountLocked((void*) bitmapResource, kBitmap);

}
@@ -133,7 +133,7 @@ void ResourceCache::decrementRefcount(void* resource) { 
}



void ResourceCache::decrementRefcount(SkBitmap* bitmapResource) {

    SkSafeUnref(bitmapResource->pixelRef());

    bitmapResource->pixelRef()->globalUnref();

    SkSafeUnref(bitmapResource->getColorTable());

    decrementRefcount((void*) bitmapResource);

}
@@ -174,7 +174,7 @@ void ResourceCache::decrementRefcountLocked(void* resource) { 
}



void ResourceCache::decrementRefcountLocked(SkBitmap* bitmapResource) {

    SkSafeUnref(bitmapResource->pixelRef());

    bitmapResource->pixelRef()->globalUnref();

    SkSafeUnref(bitmapResource->getColorTable());

    decrementRefcountLocked((void*) bitmapResource);

}