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

Commit 624ad836 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Fix Skia merge by fixing API mismatch. 

Test: compile
Change-Id: Ie524af03fd3c85cceac13abdcdd9af8ef6ca6bb9
parent 772ff11c

libs/hwui/VkLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void VkLayer::updateTexture() { 
    SkImageInfo info = SkImageInfo::MakeS32(mWidth, mHeight, kPremul_SkAlphaType);

    surface = SkSurface::MakeRenderTarget(mRenderState.getGrContext(), SkBudgeted::kNo, info);

    surface->getCanvas()->clear(SK_ColorBLUE);

    mImage = surface->makeImageSnapshot(SkBudgeted::kNo, SkSurface::kNo_ForceUnique);

    mImage = surface->makeImageSnapshot(SkBudgeted::kNo);

}



void VkLayer::onVkContextDestroyed() {

libs/hwui/tests/unit/RenderNodeDrawableTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ RENDERTHREAD_TEST(RenderNodeDrawable, projectionHwLayer) { 
        sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override {

            return sk_sp<SkSurface>();

        }

        sk_sp<SkImage> onNewImageSnapshot(SkBudgeted, SkCopyPixelsMode) override {

        sk_sp<SkImage> onNewImageSnapshot(SkBudgeted) override {

            return sk_sp<SkImage>();

        }

        void onCopyOnWrite(ContentChangeMode) override {}

libs/hwui/tests/unit/SkiaPipelineTests.cpp

+4 −4
Original line number Diff line number Diff line
@@ -201,16 +201,16 @@ namespace { 
template <typename T>

class DeferLayer : public SkSurface_Base {

public:

    DeferLayer()

        : SkSurface_Base(T().imageInfo(), nullptr) {

    }

    DeferLayer() : SkSurface_Base(T().imageInfo(), nullptr) {}

    virtual ~DeferLayer() {}



    SkCanvas* onNewCanvas() override {

        return new T();

    }

    sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override {

        return sk_sp<SkSurface>();

    }

    sk_sp<SkImage> onNewImageSnapshot(SkBudgeted, SkCopyPixelsMode) override {

    sk_sp<SkImage> onNewImageSnapshot(SkBudgeted) override {

        return sk_sp<SkImage>();

    }

    T* canvas() { return static_cast<T*>(getCanvas()); }