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

Commit 94b5c92a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SkClipOp is now an enum class"

parents 6b45e658 6c67f1d0

core/jni/android_graphics_Canvas.cpp

+6 −6
Original line number Diff line number Diff line
@@ -185,12 +185,12 @@ static jboolean quickRejectPath(JNIEnv* env, jobject, jlong canvasHandle, jlong 


// SkRegion::Op and SkClipOp are numerically identical, so we can freely cast

// from one to the other (though SkClipOp is destined to become a strict subset)

static_assert(SkRegion::kDifference_Op == static_cast<SkRegion::Op>(kDifference_SkClipOp), "");

static_assert(SkRegion::kIntersect_Op == static_cast<SkRegion::Op>(kIntersect_SkClipOp), "");

static_assert(SkRegion::kUnion_Op == static_cast<SkRegion::Op>(kUnion_SkClipOp), "");

static_assert(SkRegion::kXOR_Op == static_cast<SkRegion::Op>(kXOR_SkClipOp), "");

static_assert(SkRegion::kReverseDifference_Op == static_cast<SkRegion::Op>(kReverseDifference_SkClipOp), "");

static_assert(SkRegion::kReplace_Op == static_cast<SkRegion::Op>(kReplace_SkClipOp), "");

static_assert(SkRegion::kDifference_Op == static_cast<SkRegion::Op>(SkClipOp::kDifference), "");

static_assert(SkRegion::kIntersect_Op == static_cast<SkRegion::Op>(SkClipOp::kIntersect), "");

static_assert(SkRegion::kUnion_Op == static_cast<SkRegion::Op>(SkClipOp::kUnion), "");

static_assert(SkRegion::kXOR_Op == static_cast<SkRegion::Op>(SkClipOp::kXOR), "");

static_assert(SkRegion::kReverseDifference_Op == static_cast<SkRegion::Op>(SkClipOp::kReverseDifference), "");

static_assert(SkRegion::kReplace_Op == static_cast<SkRegion::Op>(SkClipOp::kReplace), "");



static SkClipOp opHandleToClipOp(jint opHandle) {

    // The opHandle is defined in Canvas.java to be Region::Op

core/jni/android_view_GraphicBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static jboolean android_view_GraphicBuffer_lockCanvas(JNIEnv* env, jobject, 
    Canvas* nativeCanvas = GraphicsJNI::getNativeCanvas(env, canvas);

    nativeCanvas->setBitmap(bitmap);

    nativeCanvas->clipRect(rect.left, rect.top, rect.right, rect.bottom,

            kIntersect_SkClipOp);

            SkClipOp::kIntersect);



    if (dirtyRect) {

        INVOKEV(dirtyRect, gRectClassInfo.set,

core/jni/android_view_Surface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static jlong nativeLockCanvas(JNIEnv* env, jclass clazz, 


    if (dirtyRectPtr) {

        nativeCanvas->clipRect(dirtyRect.left, dirtyRect.top,

                dirtyRect.right, dirtyRect.bottom, kIntersect_SkClipOp);

                dirtyRect.right, dirtyRect.bottom, SkClipOp::kIntersect);

    }



    if (dirtyRectObj) {

core/jni/android_view_TextureView.cpp

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static jboolean android_view_TextureView_lockCanvas(JNIEnv* env, jobject, 
    Canvas* nativeCanvas = GraphicsJNI::getNativeCanvas(env, canvas);

    nativeCanvas->setBitmap(bitmap);

    nativeCanvas->clipRect(rect.left, rect.top, rect.right, rect.bottom,

            kIntersect_SkClipOp);

            SkClipOp::kIntersect);



    if (dirtyRect) {

        INVOKEV(dirtyRect, gRectClassInfo.set,

libs/hwui/CanvasState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ void CanvasState::setClippingOutline(LinearAllocator& allocator, const Outline* 
    bool outlineIsRounded = MathUtils::isPositive(radius);

    if (!outlineIsRounded || currentTransform()->isSimple()) {

        // TODO: consider storing this rect separately, so that this can't be replaced with clip ops

        clipRect(bounds.left, bounds.top, bounds.right, bounds.bottom, kIntersect_SkClipOp);

        clipRect(bounds.left, bounds.top, bounds.right, bounds.bottom, SkClipOp::kIntersect);

    }

    if (outlineIsRounded) {

        setClippingRoundRect(allocator, bounds, radius, false);