diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
| commit | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (patch) | |
| tree | c7bfb4b07deb28223c78af4de69e2440f34c3427 /include/core/SkDevice.h | |
| parent | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (diff) | |
Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"
This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.
git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkDevice.h')
| -rw-r--r-- | include/core/SkDevice.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index e38e2aa428..ed1c8fd63b 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -90,9 +90,8 @@ public: */ virtual bool isOpaque() const = 0; - /** Return the bitmap config of the device's pixels + /** DEPRECATED - Return the bitmap config of the device's pixels */ - SK_ATTR_DEPRECATED("want to hide configness of the device -- don't use") virtual SkBitmap::Config config() const = 0; /** Return the bitmap associated with this device. Call this each time you need @@ -118,7 +117,6 @@ public: * will determines how the pixel valuess are intepreted. If the bitmap is * not kARGB_8888_Config then this parameter is ignored. */ - SK_ATTR_DEPRECATED("use SkCanvas version of same call") virtual void writePixels(const SkBitmap& bitmap, int x, int y, SkCanvas::Config8888 config8888 = SkCanvas::kNative_Premul_Config8888) = 0; |