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

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

Merge "onDrawBitmap[Nine,Latice] are never called"

parents d4ac2d90 719b95ef

libs/hwui/RecordingCanvas.cpp

+0 −8
Original line number Diff line number Diff line
@@ -929,19 +929,11 @@ void RecordingCanvas::onDrawBitmap(const SkBitmap& bm, SkScalar x, SkScalar y, 
                                   const SkPaint* paint) {

    fDL->drawImage(SkImage::MakeFromBitmap(bm), x, y, paint, BitmapPalette::Unknown);

}

void RecordingCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center, const SkRect& dst,

                                       const SkPaint* paint) {

    fDL->drawImageNine(SkImage::MakeFromBitmap(bm), center, dst, paint);

}

void RecordingCanvas::onDrawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,

                                       const SkPaint* paint, SrcRectConstraint constraint) {

    fDL->drawImageRect(SkImage::MakeFromBitmap(bm), src, dst, paint, constraint,

                       BitmapPalette::Unknown);

}

void RecordingCanvas::onDrawBitmapLattice(const SkBitmap& bm, const SkCanvas::Lattice& lattice,

                                          const SkRect& dst, const SkPaint* paint) {

    fDL->drawImageLattice(SkImage::MakeFromBitmap(bm), lattice, dst, paint, BitmapPalette::Unknown);

}



void RecordingCanvas::drawImage(const sk_sp<SkImage>& image, SkScalar x, SkScalar y,

                                const SkPaint* paint, BitmapPalette palette) {

libs/hwui/RecordingCanvas.h

+0 −3
Original line number Diff line number Diff line
@@ -182,9 +182,6 @@ public: 
    void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override;



    void onDrawBitmap(const SkBitmap&, SkScalar, SkScalar, const SkPaint*) override;

    void onDrawBitmapLattice(const SkBitmap&, const Lattice&, const SkRect&,

                             const SkPaint*) override;

    void onDrawBitmapNine(const SkBitmap&, const SkIRect&, const SkRect&, const SkPaint*) override;

    void onDrawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, const SkPaint*,

                          SrcRectConstraint) override;

libs/hwui/tests/unit/FatalTestCanvas.h

+0 −8
Original line number Diff line number Diff line
@@ -88,14 +88,6 @@ public: 
                          SrcRectConstraint) {

        ADD_FAILURE() << "onDrawBitmapRect not expected in this test";

    }

    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,

                          const SkPaint*) {

        ADD_FAILURE() << "onDrawBitmapNine not expected in this test";

    }

    void onDrawBitmapLattice(const SkBitmap&, const Lattice& lattice, const SkRect& dst,

                             const SkPaint*) {

        ADD_FAILURE() << "onDrawBitmapLattice not expected in this test";

    }

    void onClipRRect(const SkRRect& rrect, SkClipOp, ClipEdgeStyle) {

        ADD_FAILURE() << "onClipRRect not expected in this test";

    }