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

Commit 07a49e9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Pass filtering to drawLattice" into sc-dev am: 417f6b16 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c5f89ee1c4825b9f1bb1b3b3e9803a0d76cb8c
parents f5f6079d 417f6b16

libs/hwui/SkiaCanvas.cpp

+4 −1
Original line number Diff line number Diff line
@@ -700,11 +700,14 @@ void SkiaCanvas::drawNinePatch(Bitmap& bitmap, const Res_png_9patch& chunk, floa 
        NinePatchUtils::SetLatticeFlags(&lattice, flags.get(), numFlags, chunk, colors.get());

    }



    SkFilterMode filter = paint && paint->isFilterBitmap() ? SkFilterMode::kLinear

                                                           : SkFilterMode::kNearest;



    lattice.fBounds = nullptr;

    SkRect dst = SkRect::MakeLTRB(dstLeft, dstTop, dstRight, dstBottom);

    auto image = bitmap.makeImage();

    apply_looper(paint, [&](const SkPaint& p) {

        mCanvas->drawImageLattice(image.get(), lattice, dst, &p);

        mCanvas->drawImageLattice(image.get(), lattice, dst, filter, &p);

    });

}

libs/hwui/canvas/CanvasOps.h

+4 −1
Original line number Diff line number Diff line
@@ -408,21 +408,24 @@ struct CanvasOp<CanvasOpType::DrawImageLattice> { 
        const sk_sp<Bitmap>& bitmap,

        SkRect dst,

        SkCanvas::Lattice lattice,

        SkFilterMode filter,

        SkPaint  paint

    ):  dst(dst),

        lattice(lattice),

        filter(filter),

        bitmap(bitmap),

        image(bitmap->makeImage()),

        paint(std::move(paint)) {}



    SkRect dst;

    SkCanvas::Lattice lattice;

    SkFilterMode filter;

    const sk_sp<Bitmap> bitmap;

    const sk_sp<SkImage> image;



    SkPaint paint;

    void draw(SkCanvas* canvas) const {

        canvas->drawImageLattice(image.get(), lattice, dst, &paint);

        canvas->drawImageLattice(image.get(), lattice, dst, filter, &paint);

    }

    ASSERT_DRAWABLE()

};

libs/hwui/tests/unit/CanvasOpTests.cpp

+1 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ TEST(CanvasOp, simpleDrawImageLattice) { 
            bitmap,

            SkRect::MakeWH(5, 1),

            lattice,

            SkFilterMode::kNearest,

            SkPaint{}

        }

    );