| Index: bench/benchmain.cpp
|
| ===================================================================
|
| --- bench/benchmain.cpp (revision 10994)
|
| +++ bench/benchmain.cpp (working copy)
|
| @@ -199,9 +199,9 @@
|
| kPDF_Backend,
|
| };
|
|
|
| -static SkDevice* make_device(SkBitmap::Config config, const SkIPoint& size,
|
| - Backend backend, int sampleCount, GrContext* context) {
|
| - SkDevice* device = NULL;
|
| +static SkBaseDevice* make_device(SkBitmap::Config config, const SkIPoint& size,
|
| + Backend backend, int sampleCount, GrContext* context) {
|
| + SkBaseDevice* device = NULL;
|
| SkBitmap bitmap;
|
| bitmap.setConfig(config, size.fX, size.fY);
|
|
|
| @@ -209,7 +209,7 @@
|
| case kRaster_Backend:
|
| bitmap.allocPixels();
|
| erase(bitmap);
|
| - device = SkNEW_ARGS(SkDevice, (bitmap));
|
| + device = SkNEW_ARGS(SkBitmapDevice, (bitmap));
|
| break;
|
| #if SK_SUPPORT_GPU
|
| case kGPU_Backend: {
|
| @@ -780,7 +780,7 @@
|
| glContext = gContextFactory.getGLContext(gConfigs[configIndex].fContextType);
|
| }
|
| #endif
|
| - SkDevice* device = NULL;
|
| + SkBaseDevice* device = NULL;
|
| SkCanvas* canvas = NULL;
|
| SkPicture pictureRecordFrom;
|
| SkPicture pictureRecordTo;
|
|
|