diff options
author | 2013-10-31 16:24:08 +0000 | |
---|---|---|
committer | 2013-10-31 16:24:08 +0000 | |
commit | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (patch) | |
tree | c6b87adb0a09e54eee77ba3363956738a1b7967f /include/core/SkBitmap.h | |
parent | 94bdd7e3fcf493f827263bd922cb09fb4b50df4c (diff) |
add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning
BUG=
R=robertphillips@google.com, senorblanco@chromium.org, vandebo@chromium.org
Review URL: https://codereview.chromium.org/51033004
git-svn-id: http://skia.googlecode.com/svn/trunk@12055 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkBitmap.h')
-rw-r--r-- | include/core/SkBitmap.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 3e22069e60..59b6482735 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -96,20 +96,19 @@ public: */ bool isNull() const { return NULL == fPixelRef; } - /** Return the config for the bitmap. - */ + /** Return the config for the bitmap. */ Config config() const { return (Config)fConfig; } - /** DEPRECATED, use config() - */ + + SK_ATTR_DEPRECATED("use config()") Config getConfig() const { return this->config(); } - /** Return the bitmap's width, in pixels. - */ + + /** Return the bitmap's width, in pixels. */ int width() const { return fWidth; } - /** Return the bitmap's height, in pixels. - */ + + /** Return the bitmap's height, in pixels. */ int height() const { return fHeight; } - /** Return the number of bytes between subsequent rows of the bitmap. - */ + + /** Return the number of bytes between subsequent rows of the bitmap. */ size_t rowBytes() const { return fRowBytes; } /** Return the shift amount per pixel (i.e. 0 for 1-byte per pixel, 1 for @@ -189,9 +188,7 @@ public: return SkAlphaTypeIsOpaque(this->alphaType()); } - /** - * DEPRECATED: use setAlpahType() instead. - */ + SK_ATTR_DEPRECATED("use setAlphaType") void setIsOpaque(bool opaque) { this->setAlphaType(opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); } @@ -419,7 +416,7 @@ public: */ void eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const; - // DEPRECATED -- call eraseColor or eraseARGB + SK_ATTR_DEPRECATED("use eraseARGB or eraseColor") void eraseRGB(U8CPU r, U8CPU g, U8CPU b) const { this->eraseARGB(0xFF, r, g, b); } @@ -553,9 +550,7 @@ public: */ bool canCopyTo(Config newConfig) const; - /** - * DEPRECATED -- will be replaced with API on SkPaint - */ + SK_ATTR_DEPRECATED("use setFilterLevel on SkPaint") void buildMipMap(bool forceRebuild = false); #ifdef SK_BUILD_FOR_ANDROID |