add SkSurface::NewRasterDirectReleaseProc
allows for lifetime control of pixel memory on raster surface
BUG=skia:
R=fmalita@google.com, bsalomon@google.com, fmalita@chromium.org
Author: reed@google.com
Review URL: https://codereview.chromium.org/351373005
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 3f61f89..610e337 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -27,13 +27,14 @@
kGpuScratch_SurfaceType,
};
-static const int gSurfaceSize = 10;
-static SkPMColor gSurfaceStorage[gSurfaceSize * gSurfaceSize];
+static void release_storage(void* pixels, void* context) {
+ SkASSERT(pixels == context);
+ sk_free(pixels);
+}
static SkSurface* createSurface(SurfaceType surfaceType, GrContext* context,
SkImageInfo* requestedInfo = NULL) {
- static const SkImageInfo info = SkImageInfo::MakeN32Premul(gSurfaceSize,
- gSurfaceSize);
+ static const SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
if (requestedInfo) {
*requestedInfo = info;
@@ -42,9 +43,12 @@
switch (surfaceType) {
case kRaster_SurfaceType:
return SkSurface::NewRaster(info);
- case kRasterDirect_SurfaceType:
- return SkSurface::NewRasterDirect(info, gSurfaceStorage,
- info.minRowBytes());
+ case kRasterDirect_SurfaceType: {
+ const size_t rowBytes = info.minRowBytes();
+ void* storage = sk_malloc_throw(info.getSafeSize(rowBytes));
+ return SkSurface::NewRasterDirectReleaseProc(info, storage, rowBytes,
+ release_storage, storage);
+ }
case kGpu_SurfaceType:
#if SK_SUPPORT_GPU
return context ? SkSurface::NewRenderTarget(context, info) : NULL;