1. remove references to (deprecated) SkGpuCanvas
2. remove references to setDevice (soon to be deprecated)
Review URL: https://codereview.appspot.com/6597055
git-svn-id: http://skia.googlecode.com/svn/trunk@5751 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index e482fd5..f5c4175 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -301,32 +301,29 @@
#endif
};
-bool setupCanvas(SkCanvas* canvas, const CanvasConfig& c, GrContext* grCtx) {
+SkDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) {
switch (c.fDevType) {
case kRaster_DevType: {
SkBitmap bmp;
size_t rowBytes = c.fTightRowBytes ? 0 : 4 * DEV_W + 100;
bmp.setConfig(SkBitmap::kARGB_8888_Config, DEV_W, DEV_H, rowBytes);
if (!bmp.allocPixels()) {
- return false;
+ sk_throw();
+ return NULL;
}
// if rowBytes isn't tight then set the padding to a known value
if (rowBytes) {
SkAutoLockPixels alp(bmp);
memset(bmp.getPixels(), DEV_PAD, bmp.getSafeSize());
}
- canvas->setDevice(new SkDevice(bmp))->unref();
- break;
+ return new SkDevice(bmp);
}
#if SK_SUPPORT_GPU
case kGpu_DevType:
- canvas->setDevice(new SkGpuDevice(grCtx,
- SkBitmap::kARGB_8888_Config,
- DEV_W, DEV_H))->unref();
- break;
+ return new SkGpuDevice(grCtx, SkBitmap::kARGB_8888_Config, DEV_W, DEV_H);
#endif
}
- return true;
+ return NULL;
}
bool setupBitmap(SkBitmap* bitmap,
@@ -400,7 +397,8 @@
};
for (size_t i = 0; i < SK_ARRAY_COUNT(gCanvasConfigs); ++i) {
- REPORTER_ASSERT(reporter, setupCanvas(&canvas, gCanvasConfigs[i], context));
+ SkAutoTUnref<SkDevice> device(createDevice(gCanvasConfigs[i], context));
+ SkCanvas canvas(device);
static const SkCanvas::Config8888 gSrcConfigs[] = {
SkCanvas::kNative_Premul_Config8888,