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

Commit 24fa70c2 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Remove onDrawSprite API as it is no longer exposed via SkCanvas"

parents 47a9fb3b d2db5c10

libs/hwui/SkiaCanvasProxy.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -138,15 +138,6 @@ void SkiaCanvasProxy::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& ce 
    SkDEBUGFAIL("SkiaCanvasProxy::onDrawBitmapNine is not yet supported");

    SkDEBUGFAIL("SkiaCanvasProxy::onDrawBitmapNine is not yet supported");

}

}





void SkiaCanvasProxy::onDrawSprite(const SkBitmap& bitmap, int left, int top,

        const SkPaint* paint) {

    // TODO: if bitmap is a subset, do we need to add pixelRefOrigin to src?

    mCanvas->save(SkCanvas::kMatrixClip_SaveFlag);

    mCanvas->setMatrix(SkMatrix::I());

    mCanvas->drawBitmap(bitmap, left, top, paint);

    mCanvas->restore();

}



void SkiaCanvasProxy::onDrawVertices(VertexMode mode, int vertexCount, const SkPoint vertices[],

void SkiaCanvasProxy::onDrawVertices(VertexMode mode, int vertexCount, const SkPoint vertices[],

        const SkPoint texs[], const SkColor colors[], SkXfermode*, const uint16_t indices[],

        const SkPoint texs[], const SkColor colors[], SkXfermode*, const uint16_t indices[],

        int indexCount, const SkPaint& paint) {

        int indexCount, const SkPaint& paint) {

libs/hwui/SkiaCanvasProxy.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -66,8 +66,6 @@ protected: 
                                  const SkPaint* paint, SrcRectConstraint) override;

                                  const SkPaint* paint, SrcRectConstraint) override;

    virtual void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,

    virtual void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,

                                  const SkRect& dst, const SkPaint*) override;

                                  const SkRect& dst, const SkPaint*) override;

    virtual void onDrawSprite(const SkBitmap&, int left, int top,

                              const SkPaint*) override;

    virtual void onDrawVertices(VertexMode, int vertexCount, const SkPoint vertices[],

    virtual void onDrawVertices(VertexMode, int vertexCount, const SkPoint vertices[],

                                const SkPoint texs[], const SkColor colors[], SkXfermode*,

                                const SkPoint texs[], const SkColor colors[], SkXfermode*,

                                const uint16_t indices[], int indexCount,

                                const uint16_t indices[], int indexCount,