Chromium Code Reviews| Index: skia/ext/bitmap_platform_device_linux.cc |
| =================================================================== |
| --- skia/ext/bitmap_platform_device_linux.cc (revision 90617) |
| +++ skia/ext/bitmap_platform_device_linux.cc (working copy) |
| @@ -37,15 +37,6 @@ |
| } // namespace |
| -SkDevice* BitmapPlatformDeviceFactory::newDevice(SkCanvas* ignored, |
| - SkBitmap::Config config, |
| - int width, int height, |
| - bool isOpaque, |
| - bool isForLayer) { |
| - SkASSERT(config == SkBitmap::kARGB_8888_Config); |
| - return BitmapPlatformDevice::Create(width, height, isOpaque); |
| -} |
| - |
| BitmapPlatformDevice::BitmapPlatformDeviceData::BitmapPlatformDeviceData( |
| cairo_surface_t* surface) |
| : surface_(surface), |
| @@ -136,8 +127,10 @@ |
| BitmapPlatformDevice::~BitmapPlatformDevice() { |
| } |
| -SkDeviceFactory* BitmapPlatformDevice::onNewDeviceFactory() { |
| - return SkNEW(BitmapPlatformDeviceFactory); |
| +SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice( |
| + SkBitmap::Config config, int width, int height, bool isOpaque, Usage) { |
|
vandebo (ex-Chrome)
2011/06/28 19:07:54
nit: 4 space indent. (multiple occurrences.)
|
| + SkASSERT(config == SkBitmap::kARGB_8888_Config); |
|
alokp
2011/06/28 16:19:46
nit: I think we should use DCHECK in chromium code
|
| + return BitmapPlatformDevice::Create(width, height, isOpaque); |
| } |
| cairo_t* BitmapPlatformDevice::BeginPlatformPaint() { |