diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-13 19:38:10 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-13 19:38:10 +0000 |
| commit | 3da3b621c34810514a6d415a1dc782bd21648c3c (patch) | |
| tree | 4c56fd7a723670d0f243a659fa09f9a8476b4ed6 /include | |
| parent | 44a435bc1ac84748d5bec420c7c5fe09171fd971 (diff) | |
getDeviceCapabilities is no longer need, so remove it
BUG=skia:
R=bungeman@google.com, vandebo@chromium.org
Author: reed@google.com
Review URL: https://codereview.chromium.org/198943003
git-svn-id: http://skia.googlecode.com/svn/trunk@13797 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkBitmapDevice.h | 2 | ||||
| -rw-r--r-- | include/core/SkDevice.h | 12 | ||||
| -rw-r--r-- | include/device/xps/SkXPSDevice.h | 2 | ||||
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 3 | ||||
| -rw-r--r-- | include/pdf/SkPDFDevice.h | 2 |
5 files changed, 8 insertions, 13 deletions
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h index 5505042a04..25c35cef59 100644 --- a/include/core/SkBitmapDevice.h +++ b/include/core/SkBitmapDevice.h @@ -66,8 +66,6 @@ public: static SkBitmapDevice* Create(const SkImageInfo&, const SkDeviceProperties* = NULL); - virtual uint32_t getDeviceCapabilities() SK_OVERRIDE { return 0; } - /** Return the width of the device (in pixels). */ virtual int width() const SK_OVERRIDE { return fBitmap.width(); } diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index b3be78085f..1773d0ac18 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -16,6 +16,11 @@ #include "SkColor.h" #include "SkDeviceProperties.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; @@ -63,10 +68,9 @@ public: SkMetaData& getMetaData(); - enum Capabilities { - kVector_Capability = 0x1, //!< mask indicating a vector representation - }; - virtual uint32_t getDeviceCapabilities() = 0; +#ifdef SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES + virtual uint32_t getDeviceCapabilities() { return 0; } +#endif /** Return the width of the device (in pixels). */ diff --git a/include/device/xps/SkXPSDevice.h b/include/device/xps/SkXPSDevice.h index 37df14b9a4..7265fbbedc 100644 --- a/include/device/xps/SkXPSDevice.h +++ b/include/device/xps/SkXPSDevice.h @@ -67,8 +67,6 @@ public: virtual bool endSheet(); virtual bool endPortfolio(); - virtual uint32_t getDeviceCapabilities() SK_OVERRIDE; - protected: virtual void clear(SkColor color) SK_OVERRIDE; diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 64bd33f439..94ca8d46d8 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -74,9 +74,6 @@ public: virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE; // overrides from SkBaseDevice - virtual uint32_t getDeviceCapabilities() SK_OVERRIDE { - return 0; - } virtual int width() const SK_OVERRIDE { return NULL == fRenderTarget ? 0 : fRenderTarget->width(); } diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h index 0dd06469b4..daec7a3de7 100644 --- a/include/pdf/SkPDFDevice.h +++ b/include/pdf/SkPDFDevice.h @@ -70,8 +70,6 @@ public: const SkMatrix& initialTransform); SK_API virtual ~SkPDFDevice(); - virtual uint32_t getDeviceCapabilities() SK_OVERRIDE; - virtual void clear(SkColor color) SK_OVERRIDE; /** These are called inside the per-device-layer loop for each draw call. |