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

Commit c686757a authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Unify clipping return value behavior - true if not empty" into mnc-dev

parents aef3698f 5ec6a287

core/jni/android_graphics_Canvas.cpp

+6 −6
Original line number Diff line number Diff line
@@ -175,24 +175,24 @@ static jboolean quickRejectPath(JNIEnv* env, jobject, jlong canvasHandle, jlong 
static jboolean clipRect(JNIEnv*, jobject, jlong canvasHandle, jfloat l, jfloat t,

                         jfloat r, jfloat b, jint opHandle) {

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

    bool emptyClip = get_canvas(canvasHandle)->clipRect(l, t, r, b, op);

    return emptyClip ? JNI_FALSE : JNI_TRUE;

    bool nonEmptyClip = get_canvas(canvasHandle)->clipRect(l, t, r, b, op);

    return nonEmptyClip ? JNI_TRUE : JNI_FALSE;

}



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

                         jint opHandle) {

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

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

    bool emptyClip = get_canvas(canvasHandle)->clipPath(path, op);

    return emptyClip ? JNI_FALSE : JNI_TRUE;

    bool nonEmptyClip = get_canvas(canvasHandle)->clipPath(path, op);

    return nonEmptyClip ? JNI_TRUE : JNI_FALSE;

}



static jboolean clipRegion(JNIEnv* env, jobject, jlong canvasHandle, jlong deviceRgnHandle,

                           jint opHandle) {

    SkRegion* deviceRgn = reinterpret_cast<SkRegion*>(deviceRgnHandle);

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

    bool emptyClip = get_canvas(canvasHandle)->clipRegion(deviceRgn, op);

    return emptyClip ? JNI_FALSE : JNI_TRUE;

    bool nonEmptyClip = get_canvas(canvasHandle)->clipRegion(deviceRgn, op);

    return nonEmptyClip ? JNI_TRUE : JNI_FALSE;

}



static void drawColor(JNIEnv* env, jobject, jlong canvasHandle, jint color, jint modeHandle) {

libs/hwui/SkiaCanvas.cpp

+3 −3
Original line number Diff line number Diff line
@@ -419,12 +419,12 @@ bool SkiaCanvas::quickRejectPath(const SkPath& path) const { 
bool SkiaCanvas::clipRect(float left, float top, float right, float bottom, SkRegion::Op op) {

    SkRect rect = SkRect::MakeLTRB(left, top, right, bottom);

    mCanvas->clipRect(rect, op);

    return mCanvas->isClipEmpty();

    return !mCanvas->isClipEmpty();

}



bool SkiaCanvas::clipPath(const SkPath* path, SkRegion::Op op) {

    mCanvas->clipPath(*path, op);

    return mCanvas->isClipEmpty();

    return !mCanvas->isClipEmpty();

}



bool SkiaCanvas::clipRegion(const SkRegion* region, SkRegion::Op op) {
@@ -438,7 +438,7 @@ bool SkiaCanvas::clipRegion(const SkRegion* region, SkRegion::Op op) { 
    } else {

        mCanvas->clipRect(SkRect::MakeEmpty(), op);

    }

    return mCanvas->isClipEmpty();

    return !mCanvas->isClipEmpty();

}



// ----------------------------------------------------------------------------