Remove deprecated setIsOpaque() API from SkBitmap.
Clients we care (Blink, Chromium) were updated, so we can remove this now.
BUG=None
R=bsalomon@google.com, reed@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/66723017
git-svn-id: http://skia.googlecode.com/svn/trunk@12251 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 64f2e24..16f54b1 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -189,11 +189,6 @@
return SkAlphaTypeIsOpaque(this->alphaType());
}
- SK_ATTR_DEPRECATED("use setAlphaType")
- void setIsOpaque(bool opaque) {
- this->setAlphaType(opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
- }
-
/** Returns true if the bitmap is volatile (i.e. should not be cached by devices.)
*/
bool isVolatile() const;
@@ -238,8 +233,8 @@
* it will return false.
*
* Since this can be an expensive operation, the bitmap stores a flag for
- * this (isOpaque, setIsOpaque). Only call this if you need to compute this
- * value from "unknown" pixels.
+ * this (isOpaque). Only call this if you need to compute this value from
+ * "unknown" pixels.
*/
static bool ComputeIsOpaque(const SkBitmap&);
diff --git a/samplecode/SampleTinyBitmap.cpp b/samplecode/SampleTinyBitmap.cpp
index dc7157f..72664c7 100644
--- a/samplecode/SampleTinyBitmap.cpp
+++ b/samplecode/SampleTinyBitmap.cpp
@@ -58,12 +58,6 @@
static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) {
SkAutoLockPixels alp(*bm); // needed for ctable
bm->setAlphaType(isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
-#if 0
- SkColorTable* ctable = bm->getColorTable();
- if (ctable) {
- ctable->setIsOpaque(isOpaque);
- }
-#endif
}
virtual void onDrawContent(SkCanvas* canvas) {