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

Commit c4e4eef6 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"

parents 9a1eefe1 b3d50e00

core/jni/android/graphics/Camera.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ static void Camera_getMatrix(JNIEnv* env, jobject obj, jlong matrixHandle) { 
}

}





static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {

static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {

    SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();

    SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->asSkCanvas();

    jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);

    jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);

    Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);

    Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);

    v->applyToCanvas(canvas);

    v->applyToCanvas(canvas);

core/jni/android/graphics/Graphics.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -366,7 +366,7 @@ SkCanvas* GraphicsJNI::getNativeCanvas(JNIEnv* env, jobject canvas) { 
    if (!canvasHandle) {

    if (!canvasHandle) {

        return NULL;

        return NULL;

    }

    }

    SkCanvas* c = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();

    SkCanvas* c = reinterpret_cast<android::Canvas*>(canvasHandle)->asSkCanvas();

    SkASSERT(c);

    SkASSERT(c);

    return c;

    return c;

}

}

core/jni/android/graphics/NinePatch.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ public: 
    static void drawF(JNIEnv* env, jobject, jlong canvasHandle, jobject boundsRectF,

    static void drawF(JNIEnv* env, jobject, jlong canvasHandle, jobject boundsRectF,

            jlong bitmapHandle, jlong chunkHandle, jlong paintHandle,

            jlong bitmapHandle, jlong chunkHandle, jlong paintHandle,

            jint destDensity, jint srcDensity) {

            jint destDensity, jint srcDensity) {

        SkCanvas* canvas       = reinterpret_cast<Canvas*>(canvasHandle)->getSkCanvas();

        SkCanvas* canvas       = reinterpret_cast<Canvas*>(canvasHandle)->asSkCanvas();

        const SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);

        const SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);

        Res_png_9patch* chunk  = reinterpret_cast<Res_png_9patch*>(chunkHandle);

        Res_png_9patch* chunk  = reinterpret_cast<Res_png_9patch*>(chunkHandle);

        const Paint* paint     = reinterpret_cast<Paint*>(paintHandle);

        const Paint* paint     = reinterpret_cast<Paint*>(paintHandle);
@@ -139,7 +139,7 @@ public: 
    static void drawI(JNIEnv* env, jobject, jlong canvasHandle, jobject boundsRect,

    static void drawI(JNIEnv* env, jobject, jlong canvasHandle, jobject boundsRect,

            jlong bitmapHandle, jlong chunkHandle, jlong paintHandle,

            jlong bitmapHandle, jlong chunkHandle, jlong paintHandle,

            jint destDensity, jint srcDensity) {

            jint destDensity, jint srcDensity) {

        SkCanvas* canvas       = reinterpret_cast<Canvas*>(canvasHandle)->getSkCanvas();

        SkCanvas* canvas       = reinterpret_cast<Canvas*>(canvasHandle)->asSkCanvas();

        const SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);

        const SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);

        Res_png_9patch* chunk  = reinterpret_cast<Res_png_9patch*>(chunkHandle);

        Res_png_9patch* chunk  = reinterpret_cast<Res_png_9patch*>(chunkHandle);

        const Paint* paint     = reinterpret_cast<Paint*>(paintHandle);

        const Paint* paint     = reinterpret_cast<Paint*>(paintHandle);

core/jni/android/graphics/Picture.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ void Picture::draw(Canvas* canvas) { 
    }

    }

    validate();

    validate();

    if (NULL != mPicture.get()) {

    if (NULL != mPicture.get()) {

        mPicture.get()->playback(canvas->getSkCanvas());

        mPicture.get()->playback(canvas->asSkCanvas());

    }

    }

}

}

libs/hwui/Canvas.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ public: 
    //       moved within this interface! Further, the return value should

    //       moved within this interface! Further, the return value should

    //       NOT be unref'd and is valid until this canvas is destroyed or a

    //       NOT be unref'd and is valid until this canvas is destroyed or a

    //       new bitmap is set.

    //       new bitmap is set.

    virtual SkCanvas* getSkCanvas() = 0;

    virtual SkCanvas* asSkCanvas() = 0;





    virtual void setBitmap(SkBitmap* bitmap, bool copyState) = 0;

    virtual void setBitmap(SkBitmap* bitmap, bool copyState) = 0;