aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/WritePixelsTest.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-29 11:54:56 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-29 11:54:56 +0000
commit1f2f338e23789f3eef168dcbd8171a28820ba6c1 (patch)
treecfa6c68aca1dbad85f6ae0d3e1e616d9dac1369b /tests/WritePixelsTest.cpp
parent3e8466a1520343e2e7d280d9d1f39b2bd048fbb9 (diff)
Split SkDevice into SkBaseDevice and SkBitmapDevice
Diffstat (limited to 'tests/WritePixelsTest.cpp')
-rw-r--r--tests/WritePixelsTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 202bfd6abf..3db3a2abe3 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -227,7 +227,7 @@ bool checkWrite(skiatest::Reporter* reporter,
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 @@ static const CanvasConfig gCanvasConfigs[] = {
#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 @@ SkDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) {
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 @@ void WritePixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
}
#endif
- SkAutoTUnref<SkDevice> device(createDevice(gCanvasConfigs[i], context));
+ SkAutoTUnref<SkBaseDevice> device(createDevice(gCanvasConfigs[i], context));
SkCanvas canvas(device);
static const SkCanvas::Config8888 gSrcConfigs[] = {