| Index: include/core/SkBitmapDevice.h
|
| diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h
|
| index df4675e5e3d4123a7ee0b633a2eb690e8ab1ceb7..6aeb47753763d65aa68bd1d498459480a8d6ffd6 100644
|
| --- a/include/core/SkBitmapDevice.h
|
| +++ b/include/core/SkBitmapDevice.h
|
| @@ -30,39 +30,6 @@ public:
|
| */
|
| SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& deviceProperties);
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
|
| - /**
|
| - * Create a new raster device and have the pixels be automatically
|
| - * allocated. The rowBytes of the device will be computed automatically
|
| - * based on the config and the width.
|
| - *
|
| - * @param config The desired config for the pixels. If the request cannot
|
| - * be met, the closest matching support config will be used.
|
| - * @param width width (in pixels) of the device
|
| - * @param height height (in pixels) of the device
|
| - * @param isOpaque Set to true if it is known that all of the pixels will
|
| - * be drawn to opaquely. Used as an accelerator when drawing
|
| - * these pixels to another device.
|
| - */
|
| - SkBitmapDevice(SkBitmap::Config config, int width, int height, bool isOpaque = false);
|
| -
|
| - /**
|
| - * Create a new raster device and have the pixels be automatically
|
| - * allocated. The rowBytes of the device will be computed automatically
|
| - * based on the config and the width.
|
| - *
|
| - * @param config The desired config for the pixels. If the request cannot
|
| - * be met, the closest matching support config will be used.
|
| - * @param width width (in pixels) of the device
|
| - * @param height height (in pixels) of the device
|
| - * @param isOpaque Set to true if it is known that all of the pixels will
|
| - * be drawn to opaquely. Used as an accelerator when drawing
|
| - * these pixels to another device.
|
| - * @param deviceProperties Properties which affect compositing.
|
| - */
|
| - SkBitmapDevice(SkBitmap::Config config, int width, int height, bool isOpaque,
|
| - const SkDeviceProperties& deviceProperties);
|
| -#endif
|
| static SkBitmapDevice* Create(const SkImageInfo&,
|
| const SkDeviceProperties* = NULL);
|
|
|
| @@ -240,11 +207,6 @@ private:
|
| // any clip information.
|
| virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE;
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
|
| - // in support of legacy constructors
|
| - void init(SkBitmap::Config config, int width, int height, bool isOpaque);
|
| -#endif
|
| -
|
| virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
|
|
|
| /** Causes any deferred drawing to the device to be completed.
|
|
|