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

Commit 79fc3b1f authored by Matt Sarett's avatar Matt Sarett Committed by Derek Sollenberger
Browse files

Update SkiaCanvasProxy with SkSurface API change 

(cherry picked from commit 187b99292d0bf86e9e76b0c8d447abcbefe29afb)

Change-Id: I09a5ae6a844dec4607bc3f45e22dad93a00c0dc8
parent 0d4604cd

libs/hwui/SkiaCanvasProxy.cpp

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <SkPixelRef.h>

#include <SkRect.h>

#include <SkRRect.h>

#include <SkSurface.h>



#include <memory>
@@ -153,7 +154,7 @@ void SkiaCanvasProxy::onDrawVertices(VertexMode mode, int vertexCount, const SkP 
    mCanvas->drawVertices(mode, floatCount, vArray, tArray, cArray, indices, indexCount, paint);

}



SkSurface* SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {

sk_sp<SkSurface> SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {

    SkDEBUGFAIL("SkiaCanvasProxy::onNewSurface is not supported");

    return NULL;

}

libs/hwui/SkiaCanvasProxy.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 


protected:



    virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;

    virtual sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;



    virtual void willSave() override;

    virtual SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;