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

Commit 770e0b50 authored by Stan Iliev's avatar Stan Iliev
Browse files

Implement image draw functions in SkiaCanvasProxy 

Implement onDrawImage, onDrawImageRect and onDrawImageLattice in
SkiaCanvasProxy. This allows to replay SkPicture with HWUI pipeline.
This CL is needed to keep up with other changes in SkiaRecordingCanvas,
because Canvas::drawBitmap is translated to SkCanvas::drawImage.

Test: Built and ran angler-userdebug, ran HWUI unit tests.
Change-Id: Icd6cfd3bc51628a2c336faf4c95dfd5366a949a9
parent 52d6b6a0

libs/hwui/SkiaCanvasProxy.cpp

+34 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "hwui/Bitmap.h"



#include <cutils/log.h>

#include <SkLatticeIter.h>

#include <SkPatchUtils.h>

#include <SkPaint.h>

#include <SkPath.h>
@@ -140,6 +141,39 @@ void SkiaCanvasProxy::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& ce 
    SkDEBUGFAIL("SkiaCanvasProxy::onDrawBitmapNine is not yet supported");

}



void SkiaCanvasProxy::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,

        const SkPaint* paint) {

    SkBitmap skiaBitmap;

    if (image->asLegacyBitmap(&skiaBitmap, SkImage::kRO_LegacyBitmapMode)) {

        onDrawBitmap(skiaBitmap, left, top, paint);

    }

}



void SkiaCanvasProxy::onDrawImageRect(const SkImage* image, const SkRect* srcPtr, const SkRect& dst,

        const SkPaint* paint, SrcRectConstraint constraint) {

    SkBitmap skiaBitmap;

    if (image->asLegacyBitmap(&skiaBitmap, SkImage::kRO_LegacyBitmapMode)) {

        sk_sp<Bitmap> bitmap = Bitmap::createFrom(skiaBitmap.info(), *skiaBitmap.pixelRef());

        SkRect src = (srcPtr) ? *srcPtr : SkRect::MakeWH(image->width(), image->height());

        mCanvas->drawBitmap(*bitmap, src.fLeft, src.fTop, src.fRight, src.fBottom,

                dst.fLeft, dst.fTop, dst.fRight, dst.fBottom, paint);

    }

}



void SkiaCanvasProxy::onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,

        const SkPaint*) {

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

}



void SkiaCanvasProxy::onDrawImageLattice(const SkImage* image, const Lattice& lattice,

        const SkRect& dst, const SkPaint* paint) {

    SkLatticeIter iter(lattice, dst);

    SkRect srcR, dstR;

    while (iter.next(&srcR, &dstR)) {

        onDrawImageRect(image, &srcR, dstR, paint, SkCanvas::kStrict_SrcRectConstraint);

    }

}



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

        const SkPoint texs[], const SkColor colors[], SkBlendMode, const uint16_t indices[],

        int indexCount, const SkPaint& paint) {

libs/hwui/SkiaCanvasProxy.h

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

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

                                  const SkRect& dst, const SkPaint*) override;

    virtual void onDrawImage(const SkImage*, SkScalar dx, SkScalar dy, const SkPaint*);

    virtual void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,

            SrcRectConstraint);

    virtual void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,

            const SkPaint*);

    virtual void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst,

            const SkPaint*);

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

                                const SkPoint texs[], const SkColor colors[], SkBlendMode,

                                const uint16_t indices[], int indexCount,