diff options
| author |  reed <reed@chromium.org> | 2014-06-02 05:45:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-02 05:45:32 -0700 |
| commit | a6a8f00a3977e71dbce9da50a32c5e9a51c49285 (patch) | |
| tree | 940dab2b743b9af9bbe31f4fdc86e6b626569e0f /src/utils | |
| parent | 14751dbcf3d4c6a60cca4e8c809a74e4584027e2 (diff) | |
hide SkDevice::config()
TBR=robertphilips
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/302253002
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/utils/SkGatherPixelRefsAndRects.h | 2 | ||||
| -rw-r--r-- | src/utils/SkPictureUtils.cpp | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index 9f444e11f3..a5174720a9 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -159,7 +159,9 @@ 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; @@ -435,9 +437,11 @@ 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 4e52ba07c8..24111ddfb6 100644 --- a/src/utils/SkGatherPixelRefsAndRects.h +++ b/src/utils/SkGatherPixelRefsAndRects.h @@ -38,9 +38,11 @@ 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 512b228a49..4dcb855a68 100644 --- a/src/utils/SkPictureUtils.cpp +++ b/src/utils/SkPictureUtils.cpp @@ -61,9 +61,11 @@ 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; |