diff options
author | 2014-07-07 13:51:48 -0700 | |
---|---|---|
committer | 2014-07-07 13:51:48 -0700 | |
commit | 620fc60b0486765d5bf9d9d3ea50dabe4f358307 (patch) | |
tree | 109af1d64a787f882190dfdeea720120352c9d4d /include | |
parent | 58f1e925fdfc48779a4ac5db734889fc8c39afd2 (diff) |
remove SK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE
TBR=
Author: reed@google.com
Review URL: https://codereview.chromium.org/373853002
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkDevice.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 80bf24283d..2e06aab74f 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -67,27 +67,17 @@ public: bounds->setXYWH(origin.x(), origin.y(), this->width(), this->height()); } -#ifdef SK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE - virtual int width() const { - return this->imageInfo().width(); - } - virtual int height() const { - return this->imageInfo().height(); - } - virtual bool isOpaque() const { - return this->imageInfo().isOpaque(); - } -#else int width() const { return this->imageInfo().width(); } + int height() const { return this->imageInfo().height(); } + bool isOpaque() const { return this->imageInfo().isOpaque(); } -#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 |