Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prepare for removal of SK_SURFACE_COPY_ON_WRITE_CRASHES"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-29 12:57:39 +00:00
committed by Android (Google) Code Review
parent 75dda48a59 9b87556cbb
commit 2ad3cb0212
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
View File

@@ -469,7 +469,11 @@ RENDERTHREAD_SKIA_PIPELINE_TEST(RenderNodeDrawable, projectionHwLayer) {
}
SkCanvas* onNewCanvas() override { return new ProjectionTestCanvas(mDrawCounter); }
sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override { return nullptr; }
#ifdef SK_SURFACE_COPY_ON_WRITE_CRASHES
void onCopyOnWrite(ContentChangeMode) override {}
#else
bool onCopyOnWrite(ContentChangeMode) override { return true; }
#endif
int* mDrawCounter;
void onWritePixels(const SkPixmap&, int x, int y) {}
};

4
libs/hwui/tests/unit/SkiaPipelineTests.cpp
View File

@@ -221,7 +221,11 @@ public:
sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override { return nullptr; }
sk_sp<SkImage> onNewImageSnapshot(const SkIRect* bounds) override { return nullptr; }
T* canvas() { return static_cast<T*>(getCanvas()); }
#ifdef SK_SURFACE_COPY_ON_WRITE_CRASHES
void onCopyOnWrite(ContentChangeMode) override {}
#else
bool onCopyOnWrite(ContentChangeMode) override { return true; }
#endif
void onWritePixels(const SkPixmap&, int x, int y) override {}
};
}