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

Commit ce802f48 authored by Adam Hampson's avatar Adam Hampson Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev

parents 0468e3c7 5a7468f5

core/jni/android/graphics/Canvas.cpp

+7 −6
Original line number Diff line number Diff line
@@ -321,9 +321,10 @@ public: 
    }



    static jboolean clipPath(JNIEnv* env, jobject, jlong canvasHandle,

                             SkPath* path, jint op) {

                             jlong pathHandle, jint op) {

        SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle);

        bool result = canvas->clipPath(*path, static_cast<SkRegion::Op>(op));

        bool result = canvas->clipPath(*reinterpret_cast<SkPath*>(pathHandle),

                                       static_cast<SkRegion::Op>(op));

        return result ? JNI_TRUE : JNI_FALSE;

    }
@@ -336,9 +337,9 @@ public: 
    }



    static void setDrawFilter(JNIEnv* env, jobject, jlong canvasHandle,

                              SkDrawFilter* filter) {

                              jlong filterHandle) {

        SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle);

        canvas->setDrawFilter(filter);

        canvas->setDrawFilter(reinterpret_cast<SkDrawFilter*>(filterHandle));

    }



    static jboolean quickReject__RectF(JNIEnv* env, jobject, jlong canvasHandle,
@@ -350,9 +351,9 @@ public: 
    }



    static jboolean quickReject__Path(JNIEnv* env, jobject, jlong canvasHandle,

                                       SkPath* path) {

                                       jlong pathHandle) {

        SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle);

        bool result = canvas->quickReject(*path);

        bool result = canvas->quickReject(*reinterpret_cast<SkPath*>(pathHandle));

        return result ? JNI_TRUE : JNI_FALSE;

    }

core/jni/android_view_GLES20Canvas.cpp

+3 −3
Original line number Diff line number Diff line
@@ -216,9 +216,9 @@ static jint android_view_GLES20Canvas_callDrawGLFunction(JNIEnv* env, jobject cl 
}



static void android_view_GLES20Canvas_detachFunctor(JNIEnv* env,

        jobject clazz, jlong rendererHandle, jlong functorHandle) {

    OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererHandle);

    Functor* functor = reinterpret_cast<Functor*>(functorHandle);

        jobject clazz, jlong rendererPtr, jlong functorPtr) {

    OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr);

    Functor* functor = reinterpret_cast<Functor*>(functorPtr);

    renderer->detachFunctor(functor);

}