diff options
| author |  reed <reed@google.com> | 2014-06-11 07:17:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-11 07:17:11 -0700 |
| commit | 4585144956e6d383115704181470d8436fc9829d (patch) | |
| tree | aeb58f49a69b55894b61d9ff93ad2b6b2913d87f /src/utils | |
| parent | b8cd7c253f8610c654e780113746e5f2a4340688 (diff) | |
remove SK_SUPPORT_LEGACY_DEVICE_CONFIG code
BUG=skia:
R=djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/327263002
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 9 | ||||
| -rw-r--r-- | src/utils/SkGatherPixelRefsAndRects.h | 5 | ||||
| -rw-r--r-- | src/utils/SkPictureUtils.cpp | 5 |
3 files changed, 0 insertions, 19 deletions
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index e244505263..ea7d71e252 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -159,9 +159,6 @@ public: virtual int width() const SK_OVERRIDE; virtual int height() const SK_OVERRIDE; -#ifdef SK_SUPPORT_LEGACY_DEVICE_CONFIG - virtual SkBitmap::Config config() const SK_OVERRIDE; -#endif virtual bool isOpaque() const SK_OVERRIDE; virtual SkImageInfo imageInfo() const SK_OVERRIDE; @@ -437,12 +434,6 @@ int SkDeferredDevice::height() const { return immediateDevice()->height(); } -#ifdef SK_SUPPORT_LEGACY_DEVICE_CONFIG -SkBitmap::Config SkDeferredDevice::config() const { - return immediateDevice()->config(); -} -#endif - bool SkDeferredDevice::isOpaque() const { return immediateDevice()->isOpaque(); } diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h index 24111ddfb6..bd6f2e54e6 100644 --- a/src/utils/SkGatherPixelRefsAndRects.h +++ b/src/utils/SkGatherPixelRefsAndRects.h @@ -38,11 +38,6 @@ public: virtual int width() const SK_OVERRIDE { return fSize.width(); } virtual int height() const SK_OVERRIDE { return fSize.height(); } virtual bool isOpaque() const SK_OVERRIDE { return false; } -#ifdef SK_SUPPORT_LEGACY_DEVICE_CONFIG - virtual SkBitmap::Config config() const SK_OVERRIDE { - return SkBitmap::kNo_Config; - } -#endif virtual SkImageInfo imageInfo() const SK_OVERRIDE { return fEmptyBitmap.info(); } diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp index 02fa6b11c4..46a0660774 100644 --- a/src/utils/SkPictureUtils.cpp +++ b/src/utils/SkPictureUtils.cpp @@ -61,11 +61,6 @@ public: virtual int width() const SK_OVERRIDE { return fSize.width(); } virtual int height() const SK_OVERRIDE { return fSize.height(); } virtual bool isOpaque() const SK_OVERRIDE { return false; } -#ifdef SK_SUPPORT_LEGACY_DEVICE_CONFIG - virtual SkBitmap::Config config() const SK_OVERRIDE { - return SkBitmap::kNo_Config; - } -#endif virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; } virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE { return false; |