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 /src/pipe | |
| 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 'src/pipe')
| -rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 2 | ||||
| -rw-r--r-- | src/pipe/utils/SamplePipeControllers.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index f646babda5..647b15c286 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -432,7 +432,7 @@ SkGPipeCanvas::SkGPipeCanvas(SkGPipeController* controller, // We don't allocate pixels for the bitmap SkBitmap bitmap; bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); - SkDevice* device = SkNEW_ARGS(SkDevice, (bitmap)); + SkBaseDevice* device = SkNEW_ARGS(SkBitmapDevice, (bitmap)); this->setDevice(device)->unref(); // Tell the reader the appropriate flags to use. diff --git a/src/pipe/utils/SamplePipeControllers.cpp b/src/pipe/utils/SamplePipeControllers.cpp index a23d77537c..e329886894 100644 --- a/src/pipe/utils/SamplePipeControllers.cpp +++ b/src/pipe/utils/SamplePipeControllers.cpp @@ -55,7 +55,7 @@ TiledPipeController::TiledPipeController(const SkBitmap& bitmap, SkDEBUGCODE(bool extracted = )bitmap.extractSubset(&fBitmaps[i], rect); SkASSERT(extracted); - SkDevice* device = new SkDevice(fBitmaps[i]); + SkBaseDevice* device = new SkBitmapDevice(fBitmaps[i]); SkCanvas* canvas = new SkCanvas(device); device->unref(); if (initial != NULL) { |