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

Commit 5cb74bca authored by John Reck's avatar John Reck
Browse files

Canvas fastjni -> @FastNative 

Just the basic cleanup first, will follow-up with a more
comprehensive update later
Test: builds & boots, refactor no behavior change

Change-Id: Ie3a7144b5fefdfda085e2ab50da8b0e627a1ecb8
parent 4c7360e5

core/java/android/view/DisplayListCanvas.java

+28 −23
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.graphics.CanvasProperty; 
import android.graphics.Paint;

import android.util.Pools.SynchronizedPool;



import dalvik.annotation.optimization.FastNative;



/**

 * A Canvas implementation that records view system drawing operations for deferred rendering.

 * This is intended for use with a DisplayList. This class keeps a list of all the Paint and
@@ -83,9 +85,6 @@ public class DisplayListCanvas extends Canvas { 
        mDensity = 0; // disable bitmap density scaling

    }



    private static native long nCreateDisplayListCanvas(int width, int height);

    private static native void nResetDisplayListCanvas(long canvas, int width, int height);



    ///////////////////////////////////////////////////////////////////////////

    // Canvas management

    ///////////////////////////////////////////////////////////////////////////
@@ -131,9 +130,6 @@ public class DisplayListCanvas extends Canvas { 
        return nGetMaximumTextureHeight();

    }



    private static native int nGetMaximumTextureWidth();

    private static native int nGetMaximumTextureHeight();



    ///////////////////////////////////////////////////////////////////////////

    // Setup

    ///////////////////////////////////////////////////////////////////////////
@@ -148,8 +144,6 @@ public class DisplayListCanvas extends Canvas { 
        nInsertReorderBarrier(mNativeCanvasWrapper, false);

    }



    private static native void nInsertReorderBarrier(long renderer, boolean enableReorder);



    ///////////////////////////////////////////////////////////////////////////

    // Functor

    ///////////////////////////////////////////////////////////////////////////
@@ -180,15 +174,10 @@ public class DisplayListCanvas extends Canvas { 
        nCallDrawGLFunction(mNativeCanvasWrapper, drawGLFunctor, releasedCallback);

    }



    private static native void nCallDrawGLFunction(long renderer,

            long drawGLFunction, Runnable releasedCallback);



    ///////////////////////////////////////////////////////////////////////////

    // Display list

    ///////////////////////////////////////////////////////////////////////////



    protected static native long nFinishRecording(long renderer);



    /**

     * Draws the specified display list onto this canvas. The display list can only

     * be drawn if {@link android.view.RenderNode#isValid()} returns true.
@@ -199,8 +188,6 @@ public class DisplayListCanvas extends Canvas { 
        nDrawRenderNode(mNativeCanvasWrapper, renderNode.getNativeDisplayList());

    }



    private static native void nDrawRenderNode(long renderer, long renderNode);



    ///////////////////////////////////////////////////////////////////////////

    // Hardware layer

    ///////////////////////////////////////////////////////////////////////////
@@ -214,8 +201,6 @@ public class DisplayListCanvas extends Canvas { 
        nDrawLayer(mNativeCanvasWrapper, layer.getLayerHandle());

    }



    private static native void nDrawLayer(long renderer, long layer);



    ///////////////////////////////////////////////////////////////////////////

    // Drawing

    ///////////////////////////////////////////////////////////////////////////
@@ -226,9 +211,6 @@ public class DisplayListCanvas extends Canvas { 
                radius.getNativeContainer(), paint.getNativeContainer());

    }



    private static native void nDrawCircle(long renderer, long propCx,

            long propCy, long propRadius, long propPaint);



    public void drawRoundRect(CanvasProperty<Float> left, CanvasProperty<Float> top,

            CanvasProperty<Float> right, CanvasProperty<Float> bottom, CanvasProperty<Float> rx,

            CanvasProperty<Float> ry, CanvasProperty<Paint> paint) {
@@ -238,9 +220,6 @@ public class DisplayListCanvas extends Canvas { 
                paint.getNativeContainer());

    }



    private static native void nDrawRoundRect(long renderer, long propLeft, long propTop,

            long propRight, long propBottom, long propRx, long propRy, long propPaint);



    @Override

    protected void throwIfCannotDraw(Bitmap bitmap) {

        super.throwIfCannotDraw(bitmap);
@@ -250,4 +229,30 @@ public class DisplayListCanvas extends Canvas { 
                    "Canvas: trying to draw too large(" + bitmapSize + "bytes) bitmap.");

        }

    }



    @FastNative

    private static native long nCreateDisplayListCanvas(int width, int height);

    @FastNative

    private static native void nResetDisplayListCanvas(long canvas, int width, int height);

    @FastNative

    private static native int nGetMaximumTextureWidth();

    @FastNative

    private static native int nGetMaximumTextureHeight();

    @FastNative

    private static native void nInsertReorderBarrier(long renderer, boolean enableReorder);

    @FastNative

    private static native void nCallDrawGLFunction(long renderer,

            long drawGLFunction, Runnable releasedCallback);

    @FastNative

    private static native long nFinishRecording(long renderer);

    @FastNative

    private static native void nDrawRenderNode(long renderer, long renderNode);

    @FastNative

    private static native void nDrawLayer(long renderer, long layer);

    @FastNative

    private static native void nDrawCircle(long renderer, long propCx,

            long propCy, long propRadius, long propPaint);

    @FastNative

    private static native void nDrawRoundRect(long renderer, long propLeft, long propTop,

            long propRight, long propBottom, long propRx, long propRy, long propPaint);

}

core/jni/android_graphics_Canvas.cpp

+52 −50
Original line number Diff line number Diff line
@@ -575,59 +575,61 @@ static void freeTextLayoutCaches(JNIEnv* env, jobject) { 
static const JNINativeMethod gMethods[] = {

    {"getNativeFinalizer", "()J", (void*) CanvasJNI::getNativeFinalizer},

    {"initRaster", "(Landroid/graphics/Bitmap;)J", (void*) CanvasJNI::initRaster},

    {"native_setBitmap", "!(JLandroid/graphics/Bitmap;)V", (void*) CanvasJNI::setBitmap},

    {"native_isOpaque","!(J)Z", (void*) CanvasJNI::isOpaque},

    {"native_getWidth","!(J)I", (void*) CanvasJNI::getWidth},

    {"native_getHeight","!(J)I", (void*) CanvasJNI::getHeight},

    {"native_setHighContrastText","!(JZ)V", (void*) CanvasJNI::setHighContrastText},

    {"native_save","!(JI)I", (void*) CanvasJNI::save},

    {"native_saveLayer","!(JFFFFJI)I", (void*) CanvasJNI::saveLayer},

    {"native_saveLayerAlpha","!(JFFFFII)I", (void*) CanvasJNI::saveLayerAlpha},

    {"native_getSaveCount","!(J)I", (void*) CanvasJNI::getSaveCount},

    {"native_restore","!(JZ)V", (void*) CanvasJNI::restore},

    {"native_restoreToCount","!(JIZ)V", (void*) CanvasJNI::restoreToCount},

    {"native_getCTM", "!(JJ)V", (void*)CanvasJNI::getCTM},

    {"native_setMatrix","!(JJ)V", (void*) CanvasJNI::setMatrix},

    {"native_concat","!(JJ)V", (void*) CanvasJNI::concat},

    {"native_rotate","!(JF)V", (void*) CanvasJNI::rotate},

    {"native_scale","!(JFF)V", (void*) CanvasJNI::scale},

    {"native_skew","!(JFF)V", (void*) CanvasJNI::skew},

    {"native_translate","!(JFF)V", (void*) CanvasJNI::translate},

    {"native_getClipBounds","!(JLandroid/graphics/Rect;)Z", (void*) CanvasJNI::getClipBounds},

    {"native_quickReject","!(JJ)Z", (void*) CanvasJNI::quickRejectPath},

    {"native_quickReject","!(JFFFF)Z", (void*)CanvasJNI::quickRejectRect},

    {"native_clipRect","!(JFFFFI)Z", (void*) CanvasJNI::clipRect},

    {"native_clipPath","!(JJI)Z", (void*) CanvasJNI::clipPath},

    {"native_clipRegion","!(JJI)Z", (void*) CanvasJNI::clipRegion},

    {"native_drawColor","!(JII)V", (void*) CanvasJNI::drawColor},

    {"native_drawPaint","!(JJ)V", (void*) CanvasJNI::drawPaint},

    {"native_drawPoint", "!(JFFJ)V", (void*) CanvasJNI::drawPoint},

    {"native_drawPoints", "!(J[FIIJ)V", (void*) CanvasJNI::drawPoints},

    {"native_drawLine", "!(JFFFFJ)V", (void*) CanvasJNI::drawLine},

    {"native_drawLines", "!(J[FIIJ)V", (void*) CanvasJNI::drawLines},

    {"native_drawRect","!(JFFFFJ)V", (void*) CanvasJNI::drawRect},

    {"native_drawRegion", "!(JJJ)V", (void*) CanvasJNI::drawRegion },

    {"native_drawRoundRect","!(JFFFFFFJ)V", (void*) CanvasJNI::drawRoundRect},

    {"native_drawCircle","!(JFFFJ)V", (void*) CanvasJNI::drawCircle},

    {"native_drawOval","!(JFFFFJ)V", (void*) CanvasJNI::drawOval},

    {"native_drawArc","!(JFFFFFFZJ)V", (void*) CanvasJNI::drawArc},

    {"native_drawPath","!(JJJ)V", (void*) CanvasJNI::drawPath},

    {"nativeDrawVertices", "!(JII[FI[FI[II[SIIJ)V", (void*)CanvasJNI::drawVertices},

    {"native_drawNinePatch", "!(JJJFFFFJII)V", (void*)CanvasJNI::drawNinePatch},

    {"freeCaches", "()V", (void*) CanvasJNI::freeCaches},

    {"freeTextLayoutCaches", "()V", (void*) CanvasJNI::freeTextLayoutCaches},

    {"native_drawBitmap","(JLandroid/graphics/Bitmap;FFJIII)V", (void*) CanvasJNI::drawBitmap},

    {"nativeDrawBitmapMatrix", "!(JLandroid/graphics/Bitmap;JJ)V", (void*)CanvasJNI::drawBitmapMatrix},

    {"native_drawBitmap","(JLandroid/graphics/Bitmap;FFFFFFFFJII)V", (void*) CanvasJNI::drawBitmapRect},

    {"native_drawBitmap", "(J[IIIFFIIZJ)V", (void*)CanvasJNI::drawBitmapArray},

    {"nativeDrawBitmapMesh", "!(JLandroid/graphics/Bitmap;II[FI[IIJ)V", (void*)CanvasJNI::drawBitmapMesh},

    {"native_drawText","!(J[CIIFFIJJ)V", (void*) CanvasJNI::drawTextChars},

    {"native_drawText","!(JLjava/lang/String;IIFFIJJ)V", (void*) CanvasJNI::drawTextString},

    {"native_drawTextRun","!(J[CIIIIFFZJJ)V", (void*) CanvasJNI::drawTextRunChars},

    {"native_drawTextRun","!(JLjava/lang/String;IIIIFFZJJ)V", (void*) CanvasJNI::drawTextRunString},

    {"native_drawTextOnPath","!(J[CIIJFFIJJ)V", (void*) CanvasJNI::drawTextOnPathChars},

    {"native_drawTextOnPath","!(JLjava/lang/String;JFFIJJ)V", (void*) CanvasJNI::drawTextOnPathString},

    {"nativeSetDrawFilter", "!(JJ)V", (void*) CanvasJNI::setDrawFilter},

    {"freeCaches", "()V", (void*) CanvasJNI::freeCaches},

    {"freeTextLayoutCaches", "()V", (void*) CanvasJNI::freeTextLayoutCaches}



    // ------------ @FastNative ----------------

    {"native_setBitmap", "(JLandroid/graphics/Bitmap;)V", (void*) CanvasJNI::setBitmap},

    {"native_isOpaque","(J)Z", (void*) CanvasJNI::isOpaque},

    {"native_getWidth","(J)I", (void*) CanvasJNI::getWidth},

    {"native_getHeight","(J)I", (void*) CanvasJNI::getHeight},

    {"native_setHighContrastText","(JZ)V", (void*) CanvasJNI::setHighContrastText},

    {"native_save","(JI)I", (void*) CanvasJNI::save},

    {"native_saveLayer","(JFFFFJI)I", (void*) CanvasJNI::saveLayer},

    {"native_saveLayerAlpha","(JFFFFII)I", (void*) CanvasJNI::saveLayerAlpha},

    {"native_getSaveCount","(J)I", (void*) CanvasJNI::getSaveCount},

    {"native_restore","(JZ)V", (void*) CanvasJNI::restore},

    {"native_restoreToCount","(JIZ)V", (void*) CanvasJNI::restoreToCount},

    {"native_getCTM", "(JJ)V", (void*)CanvasJNI::getCTM},

    {"native_setMatrix","(JJ)V", (void*) CanvasJNI::setMatrix},

    {"native_concat","(JJ)V", (void*) CanvasJNI::concat},

    {"native_rotate","(JF)V", (void*) CanvasJNI::rotate},

    {"native_scale","(JFF)V", (void*) CanvasJNI::scale},

    {"native_skew","(JFF)V", (void*) CanvasJNI::skew},

    {"native_translate","(JFF)V", (void*) CanvasJNI::translate},

    {"native_getClipBounds","(JLandroid/graphics/Rect;)Z", (void*) CanvasJNI::getClipBounds},

    {"native_quickReject","(JJ)Z", (void*) CanvasJNI::quickRejectPath},

    {"native_quickReject","(JFFFF)Z", (void*)CanvasJNI::quickRejectRect},

    {"native_clipRect","(JFFFFI)Z", (void*) CanvasJNI::clipRect},

    {"native_clipPath","(JJI)Z", (void*) CanvasJNI::clipPath},

    {"native_clipRegion","(JJI)Z", (void*) CanvasJNI::clipRegion},

    {"native_drawColor","(JII)V", (void*) CanvasJNI::drawColor},

    {"native_drawPaint","(JJ)V", (void*) CanvasJNI::drawPaint},

    {"native_drawPoint", "(JFFJ)V", (void*) CanvasJNI::drawPoint},

    {"native_drawPoints", "(J[FIIJ)V", (void*) CanvasJNI::drawPoints},

    {"native_drawLine", "(JFFFFJ)V", (void*) CanvasJNI::drawLine},

    {"native_drawLines", "(J[FIIJ)V", (void*) CanvasJNI::drawLines},

    {"native_drawRect","(JFFFFJ)V", (void*) CanvasJNI::drawRect},

    {"native_drawRegion", "(JJJ)V", (void*) CanvasJNI::drawRegion },

    {"native_drawRoundRect","(JFFFFFFJ)V", (void*) CanvasJNI::drawRoundRect},

    {"native_drawCircle","(JFFFJ)V", (void*) CanvasJNI::drawCircle},

    {"native_drawOval","(JFFFFJ)V", (void*) CanvasJNI::drawOval},

    {"native_drawArc","(JFFFFFFZJ)V", (void*) CanvasJNI::drawArc},

    {"native_drawPath","(JJJ)V", (void*) CanvasJNI::drawPath},

    {"nativeDrawVertices", "(JII[FI[FI[II[SIIJ)V", (void*)CanvasJNI::drawVertices},

    {"native_drawNinePatch", "(JJJFFFFJII)V", (void*)CanvasJNI::drawNinePatch},

    {"nativeDrawBitmapMatrix", "(JLandroid/graphics/Bitmap;JJ)V", (void*)CanvasJNI::drawBitmapMatrix},

    {"nativeDrawBitmapMesh", "(JLandroid/graphics/Bitmap;II[FI[IIJ)V", (void*)CanvasJNI::drawBitmapMesh},

    {"native_drawText","(J[CIIFFIJJ)V", (void*) CanvasJNI::drawTextChars},

    {"native_drawText","(JLjava/lang/String;IIFFIJJ)V", (void*) CanvasJNI::drawTextString},

    {"native_drawTextRun","(J[CIIIIFFZJJ)V", (void*) CanvasJNI::drawTextRunChars},

    {"native_drawTextRun","(JLjava/lang/String;IIIIFFZJJ)V", (void*) CanvasJNI::drawTextRunString},

    {"native_drawTextOnPath","(J[CIIJFFIJJ)V", (void*) CanvasJNI::drawTextOnPathChars},

    {"native_drawTextOnPath","(JLjava/lang/String;JFFIJJ)V", (void*) CanvasJNI::drawTextOnPathString},

    {"nativeSetDrawFilter", "(JJ)V", (void*) CanvasJNI::setDrawFilter},

};



int register_android_graphics_Canvas(JNIEnv* env) {

core/jni/android_view_DisplayListCanvas.cpp

+14 −11
Original line number Diff line number Diff line
@@ -215,24 +215,27 @@ android_app_ActivityThread_dumpGraphics(JNIEnv* env, jobject clazz, jobject java 
const char* const kClassPathName = "android/view/DisplayListCanvas";



static JNINativeMethod gMethods[] = {

    { "nInsertReorderBarrier","!(JZ)V",         (void*) android_view_DisplayListCanvas_insertReorderBarrier },



    { "nCallDrawGLFunction", "!(JJLjava/lang/Runnable;)V",

    // ------------ @FastNative ------------------



    { "nInsertReorderBarrier","(JZ)V",         (void*) android_view_DisplayListCanvas_insertReorderBarrier },



    { "nCallDrawGLFunction", "(JJLjava/lang/Runnable;)V",

            (void*) android_view_DisplayListCanvas_callDrawGLFunction },



    { "nDrawRoundRect",     "!(JJJJJJJJ)V",     (void*) android_view_DisplayListCanvas_drawRoundRectProps },

    { "nDrawCircle",        "!(JJJJJ)V",        (void*) android_view_DisplayListCanvas_drawCircleProps },

    { "nDrawRoundRect",     "(JJJJJJJJ)V",     (void*) android_view_DisplayListCanvas_drawRoundRectProps },

    { "nDrawCircle",        "(JJJJJ)V",        (void*) android_view_DisplayListCanvas_drawCircleProps },



    { "nFinishRecording",   "!(J)J",            (void*) android_view_DisplayListCanvas_finishRecording },

    { "nDrawRenderNode",    "!(JJ)V",           (void*) android_view_DisplayListCanvas_drawRenderNode },

    { "nFinishRecording",   "(J)J",            (void*) android_view_DisplayListCanvas_finishRecording },

    { "nDrawRenderNode",    "(JJ)V",           (void*) android_view_DisplayListCanvas_drawRenderNode },



    { "nCreateDisplayListCanvas", "!(II)J",     (void*) android_view_DisplayListCanvas_createDisplayListCanvas },

    { "nResetDisplayListCanvas", "!(JII)V",     (void*) android_view_DisplayListCanvas_resetDisplayListCanvas },

    { "nCreateDisplayListCanvas", "(II)J",     (void*) android_view_DisplayListCanvas_createDisplayListCanvas },

    { "nResetDisplayListCanvas", "(JII)V",     (void*) android_view_DisplayListCanvas_resetDisplayListCanvas },



    { "nDrawLayer",               "!(JJ)V",     (void*) android_view_DisplayListCanvas_drawLayer },

    { "nDrawLayer",               "(JJ)V",     (void*) android_view_DisplayListCanvas_drawLayer },



    { "nGetMaximumTextureWidth",  "!()I",       (void*) android_view_DisplayListCanvas_getMaxTextureWidth },

    { "nGetMaximumTextureHeight", "!()I",       (void*) android_view_DisplayListCanvas_getMaxTextureHeight },

    { "nGetMaximumTextureWidth",  "()I",       (void*) android_view_DisplayListCanvas_getMaxTextureWidth },

    { "nGetMaximumTextureHeight", "()I",       (void*) android_view_DisplayListCanvas_getMaxTextureHeight },

};



static JNINativeMethod gActivityThreadMethods[] = {

graphics/java/android/graphics/Canvas.java

+67 −19

File changed.

Preview size limit exceeded, changes collapsed.