Index: tests/WritePixelsTest.cpp |
=================================================================== |
--- tests/WritePixelsTest.cpp (revision 10994) |
+++ tests/WritePixelsTest.cpp (working copy) |
@@ -227,7 +227,7 @@ |
const SkBitmap& bitmap, |
int writeX, int writeY, |
SkCanvas::Config8888 config8888) { |
- SkDevice* dev = canvas->getDevice(); |
+ SkBaseDevice* dev = canvas->getDevice(); |
if (!dev) { |
return false; |
} |
@@ -305,7 +305,7 @@ |
#endif |
}; |
-SkDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) { |
+SkBaseDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) { |
switch (c.fDevType) { |
case kRaster_DevType: { |
SkBitmap bmp; |
@@ -320,7 +320,7 @@ |
SkAutoLockPixels alp(bmp); |
memset(bmp.getPixels(), DEV_PAD, bmp.getSafeSize()); |
} |
- return new SkDevice(bmp); |
+ return new SkBitmapDevice(bmp); |
} |
#if SK_SUPPORT_GPU |
case kGpu_BottomLeft_DevType: |
@@ -435,7 +435,7 @@ |
} |
#endif |
- SkAutoTUnref<SkDevice> device(createDevice(gCanvasConfigs[i], context)); |
+ SkAutoTUnref<SkBaseDevice> device(createDevice(gCanvasConfigs[i], context)); |
SkCanvas canvas(device); |
static const SkCanvas::Config8888 gSrcConfigs[] = { |