Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: include/core/SkBitmap.h

Issue 54603004: Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/tilemodes.cpp ('k') | include/core/SkBitmapDevice.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 3e22069e60af29980ecc110ba379bd3b8bfa6c56..59b6482735cc2be98187914e36a575b17c05ff4c 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
« no previous file with comments | « gm/tilemodes.cpp ('k') | include/core/SkBitmapDevice.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698