diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkBitmapDevice.h | 38 | ||||
| -rw-r--r-- | include/core/SkDevice.h | 42 | ||||
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 10 |
3 files changed, 0 insertions, 90 deletions
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h index df4675e5e3..6aeb477537 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. diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 34d5625c65..e2f676465e 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -17,13 +17,6 @@ #include "SkDeviceProperties.h" #include "SkImageFilter.h" -// getDeviceCapabilities() is not called by skia, but this flag keeps it around -// for clients that have "override" annotations on their subclass. These overrides -// should be deleted. -//#define SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES - -//#define SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG - class SkClipStack; class SkDraw; struct SkIRect; @@ -49,33 +42,10 @@ public: virtual ~SkBaseDevice(); -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG - /** - * Creates a device that is of the same type as this device (e.g. SW-raster, - * GPU, or PDF). The backing store for this device is created automatically - * (e.g. offscreen pixels or FBO or whatever is appropriate). - * - * @param width width of the device to create - * @param height height of the device to create - * @param isOpaque performance hint, set to true if you know that you will - * draw into this device such that all of the pixels will - * be opaque. - */ - SkBaseDevice* createCompatibleDevice(SkBitmap::Config config, - int width, int height, - bool isOpaque); -#endif SkBaseDevice* createCompatibleDevice(const SkImageInfo&); SkMetaData& getMetaData(); -#ifdef SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES - enum Capabilities { - kVector_Capability = 0x1, - }; - virtual uint32_t getDeviceCapabilities() { return 0; } -#endif - /** Return the width of the device (in pixels). */ virtual int width() const = 0; @@ -407,18 +377,6 @@ private: // just called by SkCanvas for saveLayer SkBaseDevice* createCompatibleDeviceForSaveLayer(const SkImageInfo&); -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG - /** - * Justs exists during the period where clients still "override" this - * signature. They are supported by our base-impl calling this old - * signature from the new one (using ImageInfo). - */ - virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config config, - int width, int height, - bool isOpaque, Usage) { - return NULL; - } -#endif virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) { return NULL; } diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index ce2ffa11ef..d7d797a102 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -50,16 +50,6 @@ public: */ static SkGpuDevice* Create(GrContext*, const SkImageInfo&, int sampleCount); -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG - /** - * New device that will create an offscreen renderTarget based on the - * config, width, height, and sampleCount. The device's storage will not - * count against the GrContext's texture cache budget. The device's pixels - * will be uninitialized. TODO: This can fail, replace with a factory function. - */ - SkGpuDevice(GrContext*, SkBitmap::Config, int width, int height, int sampleCount = 0); -#endif - /** * DEPRECATED -- need to make this private, call Create(surface) * New device that will render to the specified renderTarget. |