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

Commit 4efe0bed authored by Mike Reed's avatar Mike Reed
Browse files

onDrawImageNine is no longer used

nine-patch draws now route through onDrawImageLattice, and canvas no
longer ever calls onDrawImageNine.

Test: make

Change-Id: Ie1d5b0c72690a4986e97efa1feeb736ef704a079
parent 86e3bd8a
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ X(DrawAnnotation)
X(DrawDrawable)
X(DrawDrawable)
X(DrawPicture)
X(DrawPicture)
X(DrawImage)
X(DrawImage)
X(DrawImageNine)
X(DrawImageRect)
X(DrawImageRect)
X(DrawImageLattice)
X(DrawImageLattice)
X(DrawTextBlob)
X(DrawTextBlob)
+0 −25
Original line number Original line Diff line number Diff line
@@ -319,23 +319,6 @@ struct DrawImage final : Op {
    BitmapPalette palette;
    BitmapPalette palette;
    void draw(SkCanvas* c, const SkMatrix&) const { c->drawImage(image.get(), x, y, &paint); }
    void draw(SkCanvas* c, const SkMatrix&) const { c->drawImage(image.get(), x, y, &paint); }
};
};
struct DrawImageNine final : Op {
    static const auto kType = Type::DrawImageNine;
    DrawImageNine(sk_sp<const SkImage>&& image, const SkIRect& center, const SkRect& dst,
                  const SkPaint* paint)
            : image(std::move(image)), center(center), dst(dst) {
        if (paint) {
            this->paint = *paint;
        }
    }
    sk_sp<const SkImage> image;
    SkIRect center;
    SkRect dst;
    SkPaint paint;
    void draw(SkCanvas* c, const SkMatrix&) const {
        c->drawImageNine(image.get(), center, dst, &paint);
    }
};
struct DrawImageRect final : Op {
struct DrawImageRect final : Op {
    static const auto kType = Type::DrawImageRect;
    static const auto kType = Type::DrawImageRect;
    DrawImageRect(sk_sp<const SkImage>&& image, const SkRect* src, const SkRect& dst,
    DrawImageRect(sk_sp<const SkImage>&& image, const SkRect* src, const SkRect& dst,
@@ -633,10 +616,6 @@ void DisplayListData::drawImage(sk_sp<const SkImage> image, SkScalar x, SkScalar
                                const SkPaint* paint, BitmapPalette palette) {
                                const SkPaint* paint, BitmapPalette palette) {
    this->push<DrawImage>(0, std::move(image), x, y, paint, palette);
    this->push<DrawImage>(0, std::move(image), x, y, paint, palette);
}
}
void DisplayListData::drawImageNine(sk_sp<const SkImage> image, const SkIRect& center,
                                    const SkRect& dst, const SkPaint* paint) {
    this->push<DrawImageNine>(0, std::move(image), center, dst, paint);
}
void DisplayListData::drawImageRect(sk_sp<const SkImage> image, const SkRect* src,
void DisplayListData::drawImageRect(sk_sp<const SkImage> image, const SkRect* src,
                                    const SkRect& dst, const SkPaint* paint,
                                    const SkRect& dst, const SkPaint* paint,
                                    SkCanvas::SrcRectConstraint constraint, BitmapPalette palette) {
                                    SkCanvas::SrcRectConstraint constraint, BitmapPalette palette) {
@@ -944,10 +923,6 @@ void RecordingCanvas::onDrawImage(const SkImage* img, SkScalar x, SkScalar y,
                                  const SkPaint* paint) {
                                  const SkPaint* paint) {
    fDL->drawImage(sk_ref_sp(img), x, y, paint, BitmapPalette::Unknown);
    fDL->drawImage(sk_ref_sp(img), x, y, paint, BitmapPalette::Unknown);
}
}
void RecordingCanvas::onDrawImageNine(const SkImage* img, const SkIRect& center, const SkRect& dst,
                                      const SkPaint* paint) {
    fDL->drawImageNine(sk_ref_sp(img), center, dst, paint);
}
void RecordingCanvas::onDrawImageRect(const SkImage* img, const SkRect* src, const SkRect& dst,
void RecordingCanvas::onDrawImageRect(const SkImage* img, const SkRect* src, const SkRect& dst,
                                      const SkPaint* paint, SrcRectConstraint constraint) {
                                      const SkPaint* paint, SrcRectConstraint constraint) {
    fDL->drawImageRect(sk_ref_sp(img), src, dst, paint, constraint, BitmapPalette::Unknown);
    fDL->drawImageRect(sk_ref_sp(img), src, dst, paint, constraint, BitmapPalette::Unknown);
+0 −1
Original line number Original line Diff line number Diff line
@@ -188,7 +188,6 @@ public:


    void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
    void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
    void onDrawImageLattice(const SkImage*, const Lattice&, const SkRect&, const SkPaint*) override;
    void onDrawImageLattice(const SkImage*, const Lattice&, const SkRect&, const SkPaint*) override;
    void onDrawImageNine(const SkImage*, const SkIRect&, const SkRect&, const SkPaint*) override;
    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
                         SrcRectConstraint) override;
                         SrcRectConstraint) override;


+0 −5
Original line number Original line Diff line number Diff line
@@ -90,11 +90,6 @@ protected:
        mOutput << mIdent << "drawImage" << std::endl;
        mOutput << mIdent << "drawImage" << std::endl;
    }
    }


    void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
                         const SkPaint*) override {
        mOutput << mIdent << "drawImageNine" << std::endl;
    }

    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
                         SrcRectConstraint) override {
                         SrcRectConstraint) override {
        mOutput << mIdent << "drawImageRect" << std::endl;
        mOutput << mIdent << "drawImageRect" << std::endl;
+1 −7
Original line number Original line Diff line number Diff line
@@ -119,12 +119,6 @@ public:
        drawImageRectCount++;
        drawImageRectCount++;
    }
    }


    int drawImageNineCount = 0;
    void onDrawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
                         const SkPaint* paint) override {
        drawImageNineCount++;
    }

    int drawImageLatticeCount = 0;
    int drawImageLatticeCount = 0;
    void onDrawImageLattice(const SkImage* image, const SkCanvas::Lattice& lattice,
    void onDrawImageLattice(const SkImage* image, const SkCanvas::Lattice& lattice,
                            const SkRect& dst, const SkPaint* paint) override {
                            const SkRect& dst, const SkPaint* paint) override {
Loading