diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 17:49:04 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 17:49:04 +0000 |
| commit | 3055b700189afdd02486ed8f2279cea1d8897243 (patch) | |
| tree | a66e6ce6e9717464dd67eb206f76440da9bab059 /tests/WritePixelsTest.cpp | |
| parent | 4eaa6647e70c9404d1c920f674d706ca2d2a76b9 (diff) | |
Split SkDevice out of SkBitmapDevice
https://codereview.chromium.org/22978012/
git-svn-id: http://skia.googlecode.com/svn/trunk@10830 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/WritePixelsTest.cpp')
| -rw-r--r-- | tests/WritePixelsTest.cpp | 8 |
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[] = { |