| Index: src/core/SkBitmapDevice.cpp
|
| diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp
|
| index dd43e963e6e3c9639ee27d342746fc75e09d65df..ba529a766b5c0595268f3d9e032718f419730a0f 100644
|
| --- a/src/core/SkBitmapDevice.cpp
|
| +++ b/src/core/SkBitmapDevice.cpp
|
| @@ -68,33 +68,6 @@ SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties&
|
| SkASSERT(valid_for_bitmap_device(bitmap.info(), NULL));
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
|
| -void SkBitmapDevice::init(SkBitmap::Config config, int width, int height, bool isOpaque) {
|
| - fBitmap.setConfig(config, width, height, 0, isOpaque ?
|
| - kOpaque_SkAlphaType : kPremul_SkAlphaType);
|
| -
|
| - if (SkBitmap::kNo_Config != config) {
|
| - if (!fBitmap.allocPixels()) {
|
| - // indicate failure by zeroing our bitmap
|
| - fBitmap.setConfig(config, 0, 0, 0, isOpaque ?
|
| - kOpaque_SkAlphaType : kPremul_SkAlphaType);
|
| - } else if (!isOpaque) {
|
| - fBitmap.eraseColor(SK_ColorTRANSPARENT);
|
| - }
|
| - }
|
| -}
|
| -
|
| -SkBitmapDevice::SkBitmapDevice(SkBitmap::Config config, int width, int height, bool isOpaque) {
|
| - this->init(config, width, height, isOpaque);
|
| -}
|
| -
|
| -SkBitmapDevice::SkBitmapDevice(SkBitmap::Config config, int width, int height, bool isOpaque,
|
| - const SkDeviceProperties& deviceProperties)
|
| - : SkBaseDevice(deviceProperties)
|
| -{
|
| - this->init(config, width, height, isOpaque);
|
| -}
|
| -#endif
|
| SkBitmapDevice* SkBitmapDevice::Create(const SkImageInfo& origInfo,
|
| const SkDeviceProperties* props) {
|
| SkImageInfo info = origInfo;
|
|
|