diff options
| author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 20:06:40 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 20:06:40 +0000 |
| commit | 9b051a375ba6d6b61cea98f35834cd032aaa5347 (patch) | |
| tree | cea9d4aab32afcbbc193455a78a49b6d231e0a39 /samplecode/SampleApp.cpp | |
| parent | 8cee797901763ab0922eb9ef484cfdcbc94bee54 (diff) | |
Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready.
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index b3632f840f..53c28e4d74 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -269,7 +269,7 @@ public: SampleWindow* win) { #if SK_SUPPORT_GPU if (IsGpuDeviceType(dType) && NULL != fCurContext) { - SkAutoTUnref<SkBaseDevice> device(new SkGpuDevice(fCurContext, fCurRenderTarget)); + SkAutoTUnref<SkDevice> device(new SkGpuDevice(fCurContext, fCurRenderTarget)); return new SkCanvas(device); } else #endif @@ -1429,7 +1429,7 @@ void SampleWindow::afterChildren(SkCanvas* orig) { if (fRequestGrabImage) { fRequestGrabImage = false; - SkBaseDevice* device = orig->getDevice(); + SkDevice* device = orig->getDevice(); SkBitmap bmp; if (device->accessBitmap(false).copyTo(&bmp, SkBitmap::kARGB_8888_Config)) { static int gSampleGrabCounter; |