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 /include/core | |
| 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 'include/core')
| -rw-r--r-- | include/core/SkBitmapDevice.h | 6 | ||||
| -rw-r--r-- | include/core/SkDevice.h | 9 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h index 26c0574156..48b0386dc2 100644 --- a/include/core/SkBitmapDevice.h +++ b/include/core/SkBitmapDevice.h @@ -45,12 +45,6 @@ public: */ virtual bool isOpaque() const SK_OVERRIDE { return fBitmap.isOpaque(); } -#ifdef SK_SUPPORT_LEGACY_DEVICE_CONFIG - /** Return the bitmap config of the device's pixels - */ - virtual SkBitmap::Config config() const SK_OVERRIDE { return fBitmap.config(); } -#endif - virtual SkImageInfo imageInfo() const SK_OVERRIDE; /** diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index e58a491563..25ad499386 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -1,4 +1,3 @@ - /* * Copyright 2010 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkDevice_DEFINED #define SkDevice_DEFINED @@ -76,18 +74,11 @@ public: bounds->setXYWH(origin.x(), origin.y(), this->width(), this->height()); } - /** Returns true if the device's bitmap's config treats every pixel as implicitly opaque. */ virtual bool isOpaque() const = 0; -#ifdef SK_SUPPORT_LEGACY_DEVICE_CONFIG - /** Return the bitmap config of the device's pixels - */ - virtual SkBitmap::Config config() const = 0; -#endif - /** Return the bitmap associated with this device. Call this each time you need to access the bitmap, as it notifies the subclass to perform any flushing etc. before you examine the pixels. |