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

Commit 477d7d1b authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Revert "Follow up for change 18b4cbee." 

This reverts commit c5b281c9.

Change-Id: Id36f463e73068e14bc8fac0a289180be078ffbf9
parent c5b281c9

core/jni/android_view_GLES20Canvas.cpp

+9 −11
Original line number Diff line number Diff line
@@ -336,36 +336,34 @@ static jboolean android_view_GLES20Canvas_quickReject(JNIEnv* env, jobject clazz 


static jboolean android_view_GLES20Canvas_clipRectF(JNIEnv* env, jobject clazz,

        jlong rendererPtr, jfloat left, jfloat top, jfloat right, jfloat bottom,

        jint op) {

        SkRegion::Op op) {

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

    const bool result = renderer->clipRect(left, top, right, bottom,

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

    const bool result = renderer->clipRect(left, top, right, bottom, op);

    return result ? JNI_TRUE : JNI_FALSE;

}



static jboolean android_view_GLES20Canvas_clipRect(JNIEnv* env, jobject clazz,

        jlong rendererPtr, jint left, jint top, jint right, jint bottom,

        jint op) {

        SkRegion::Op op) {

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

    const bool result = renderer->clipRect(float(left), float(top), float(right),

                                           float(bottom),

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

                                           float(bottom), op);

    return result ? JNI_TRUE : JNI_FALSE;

}



static jboolean android_view_GLES20Canvas_clipPath(JNIEnv* env, jobject clazz,

        jlong rendererPtr, jlong pathPtr, jint op) {

        jlong rendererPtr, jint pathPtr, SkRegion::Op op) {

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

    SkPath* path = reinterpret_cast<SkPath*>(pathPtr);

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

    const bool result = renderer->clipPath(path, op);

    return result ? JNI_TRUE : JNI_FALSE;

}



static jboolean android_view_GLES20Canvas_clipRegion(JNIEnv* env, jobject clazz,

        jlong rendererPtr, jlong regionPtr, jint op) {

        jlong rendererPtr, jint regionPtr, SkRegion::Op op) {

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

    SkRegion* region = reinterpret_cast<SkRegion*>(regionPtr);

    const bool result = renderer->clipRegion(region, static_cast<SkRegion::Op>(op));

    const bool result = renderer->clipRegion(region, op);

    return result ? JNI_TRUE : JNI_FALSE;

}
@@ -996,7 +994,7 @@ static void android_view_GLES20Canvas_setLayerPaint(JNIEnv* env, jobject clazz, 
}



static void android_view_GLES20Canvas_setLayerColorFilter(JNIEnv* env, jobject clazz,

        jlong layerPtr, jlong colorFilterPtr) {

        jlong layerPtr, jint colorFilterPtr) {

    Layer* layer = reinterpret_cast<Layer*>(layerPtr);

    if (layer) {

        SkiaColorFilter* colorFilter = reinterpret_cast<SkiaColorFilter*>(colorFilterPtr);