diff options
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/bitmap_platform_device_mac.cc | 8 | ||||
| -rw-r--r-- | skia/ext/bitmap_platform_device_mac.h | 8 | ||||
| -rw-r--r-- | skia/ext/platform_canvas_mac.cc | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index 2daf772..834655d 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/skia/ext/bitmap_platform_device_mac.cc @@ -175,8 +175,10 @@ void BitmapPlatformDevice::BitmapPlatformDeviceData::LoadConfig() { // that we can create the pixel data before calling the constructor. This is // required so that we can call the base class' constructor with the pixel // data. -BitmapPlatformDevice* BitmapPlatformDevice::CreateWithContext( - CGContextRef context, int width, int height, bool is_opaque) { +BitmapPlatformDevice* BitmapPlatformDevice::Create(CGContextRef context, + int width, + int height, + bool is_opaque) { SkBitmap bitmap; bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); if (bitmap.allocPixels() != true) @@ -221,7 +223,7 @@ BitmapPlatformDevice* BitmapPlatformDevice::CreateWithData(uint8_t* data, if (data) context = CGContextForData(data, width, height); - return CreateWithContext(context, width, height, is_opaque); + return Create(context, width, height, is_opaque); } // The device will own the bitmap, which corresponds to also owning the pixel diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h index d293cd4..7f1be1e 100644 --- a/skia/ext/bitmap_platform_device_mac.h +++ b/skia/ext/bitmap_platform_device_mac.h @@ -26,11 +26,11 @@ namespace skia { class BitmapPlatformDevice : public PlatformDevice { public: // |context| may be NULL. - static BitmapPlatformDevice* CreateWithContext(CGContextRef context, - int width, int height, - bool is_opaque); + static BitmapPlatformDevice* Create(CGContextRef context, + int width, int height, + bool is_opaque); - // Creates a context for |data| and calls CreateWithContext. + // Creates a context for |data| and calls Create. static BitmapPlatformDevice* CreateWithData(uint8_t* data, int width, int height, bool is_opaque); diff --git a/skia/ext/platform_canvas_mac.cc b/skia/ext/platform_canvas_mac.cc index e75e55aa..33d7eb2 100644 --- a/skia/ext/platform_canvas_mac.cc +++ b/skia/ext/platform_canvas_mac.cc @@ -63,8 +63,7 @@ SkDevice* PlatformCanvas::createDevice(SkBitmap::Config config, int height, bool is_opaque, bool isForLayer) { SkASSERT(config == SkBitmap::kARGB_8888_Config); - return BitmapPlatformDevice::CreateWithContext(NULL, width, height, - is_opaque); + return BitmapPlatformDevice::Create(NULL, width, height, is_opaque); } } // namespace skia |