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

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

Merge "Update method signature to match private Skia header."

parents 65d3fdca dbb4bc80

libs/hwui/tests/unit/RenderNodeDrawableTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ RENDERTHREAD_SKIA_PIPELINE_TEST(RenderNodeDrawable, projectionHwLayer) { 
        ProjectionLayer(int* drawCounter)

                : SkSurface_Base(SkImageInfo::MakeN32Premul(LAYER_WIDTH, LAYER_HEIGHT), nullptr)

                , mDrawCounter(drawCounter) {}

        virtual sk_sp<SkImage> onNewImageSnapshot() override {

        virtual sk_sp<SkImage> onNewImageSnapshot(const SkIRect* bounds) override {

            EXPECT_EQ(3, (*mDrawCounter)++);

            EXPECT_EQ(SkRect::MakeLTRB(100 - SCROLL_X, 100 - SCROLL_Y, 300 - SCROLL_X,

                                       300 - SCROLL_Y),

libs/hwui/tests/unit/SkiaPipelineTests.cpp

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


    SkCanvas* onNewCanvas() override { return new T(); }

    sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override { return nullptr; }

    sk_sp<SkImage> onNewImageSnapshot() override { return nullptr; }

    sk_sp<SkImage> onNewImageSnapshot(const SkIRect* bounds) override { return nullptr; }

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

    void onCopyOnWrite(ContentChangeMode) override {}

    void onWritePixels(const SkPixmap&, int x, int y) override {}