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

Commit 304cc538 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Use the generic Canvas instead of SkCanvas 

bug: 18642206
Change-Id: I0dc3f6b620083e5948c2d4be541ae7c6261b3482
parent 83eb4443

core/jni/android/graphics/Movie.cpp

+10 −6
Original line number Diff line number Diff line 
#include "Canvas.h"

#include "ScopedLocalRef.h"

#include "SkFrontBufferedStream.h"

#include "SkMovie.h"
@@ -63,16 +64,19 @@ static jboolean movie_setTime(JNIEnv* env, jobject movie, jint ms) { 
    return J2Movie(env, movie)->setTime(ms) ? JNI_TRUE : JNI_FALSE;

}



static void movie_draw(JNIEnv* env, jobject movie, jobject canvas,

static void movie_draw(JNIEnv* env, jobject movie, jlong canvasHandle,

                       jfloat fx, jfloat fy, jlong paintHandle) {

    NPE_CHECK_RETURN_VOID(env, movie);

    NPE_CHECK_RETURN_VOID(env, canvas);

    // its OK for paint to be null



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

    const android::Paint* p = reinterpret_cast<android::Paint*>(paintHandle);



    // Canvas should never be NULL. However paint is an optional parameter and

    // therefore may be NULL.

    SkASSERT(c != NULL);



    SkMovie* m = J2Movie(env, movie);

    SkCanvas* c = GraphicsJNI::getNativeCanvas(env, canvas);

    const SkBitmap& b = m->bitmap();

    const android::Paint* p = reinterpret_cast<android::Paint*>(paintHandle);



    c->drawBitmap(b, fx, fy, p);

}
@@ -140,7 +144,7 @@ static JNINativeMethod gMethods[] = { 
    {   "isOpaque", "()Z",  (void*)movie_isOpaque  },

    {   "duration", "()I",  (void*)movie_duration  },

    {   "setTime",  "(I)Z", (void*)movie_setTime  },

    {   "nDraw",    "(Landroid/graphics/Canvas;FFJ)V",

    {   "nDraw",    "(JFFJ)V",

                            (void*)movie_draw  },

    { "nativeDecodeAsset", "(J)Landroid/graphics/Movie;",

                            (void*)movie_decodeAsset },

graphics/java/android/graphics/Movie.java

+4 −3
Original line number Diff line number Diff line
@@ -37,14 +37,15 @@ public class Movie { 


    public native boolean setTime(int relativeMilliseconds);



    private native void nDraw(Canvas canvas, float x, float y, long paintHandle);

    private native void nDraw(long nativeCanvas, float x, float y, long paintHandle);



    public void draw(Canvas canvas, float x, float y, Paint paint) {

        nDraw(canvas, x, y, paint != null ? paint.getNativeInstance() : 0);

        nDraw(canvas.getNativeCanvasWrapper(), x, y,

                paint != null ? paint.getNativeInstance() : 0);

    }



    public void draw(Canvas canvas, float x, float y) {

        nDraw(canvas, x, y, 0);

        nDraw(canvas.getNativeCanvasWrapper(), x, y, 0);

    }



    public static Movie decodeStream(InputStream is) {