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

Unified Diff: include/core/SkBitmap.h

Issue 25275004: store SkAlphaType inside SkBitmap, on road to support unpremul (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
Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 07d2b955533b78d37a7ebcb96e3217fd1e8bcb6c..6fe492aa7d90366b9605a2d4733c60533db63711 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -11,6 +11,7 @@
#define SkBitmap_DEFINED
#include "Sk64.h"
+#include "SkAlpha.h"
#include "SkColor.h"
#include "SkColorTable.h"
#include "SkPoint.h"
@@ -130,6 +131,9 @@ public:
*/
int rowBytesAsPixels() const { return fRowBytes >> (fBytesPerPixel >> 1); }
+ SkAlphaType alphaType() const { return (SkAlphaType)fAlphaType; }
+ void setAlphaType(SkAlphaType);
+
/** Return the address of the pixels for this SkBitmap.
*/
void* getPixels() const { return fPixels; }
@@ -177,10 +181,12 @@ public:
*/
bool isOpaque() const;
- /** Specify if this bitmap's pixels are all opaque or not. Is only meaningful for configs
- that support per-pixel alpha (RGB32, A1, A8).
- */
- void setIsOpaque(bool);
+ /**
+ * DEPRECATED: use setAlpahType() instead.
+ */
+ 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.)
*/
@@ -232,13 +238,6 @@ public:
static bool ComputeIsOpaque(const SkBitmap&);
/**
- * Calls ComputeIsOpaque, and passes its result to setIsOpaque().
- */
- void computeAndSetOpaquePredicate() {
- this->setIsOpaque(ComputeIsOpaque(*this));
- }
-
- /**
* Return the bitmap's bounds [0, 0, width, height] as an SkRect
*/
void getBounds(SkRect* bounds) const;
@@ -248,7 +247,14 @@ public:
ComputeRowBytes() is called to compute the optimal value. This resets
any pixel/colortable ownership, just like reset().
*/
- void setConfig(Config, int width, int height, size_t rowBytes = 0);
+ bool setConfig(Config, int width, int height, size_t rowBytes, SkAlphaType);
+
+ bool setConfig(Config config, int width, int height, size_t rowBytes = 0) {
+ return this->setConfig(config, width, height, rowBytes,
+ kPremul_SkAlphaType);
+ }
+
+
/** Use this to assign a new pixel address for an existing bitmap. This
will automatically release any pixelref previously installed. Only call
this if you are handling ownership/lifetime of the pixel memory.
@@ -672,6 +678,7 @@ private:
uint32_t fWidth;
uint32_t fHeight;
uint8_t fConfig;
+ uint8_t fAlphaType;
uint8_t fFlags;
uint8_t fBytesPerPixel; // based on config
« no previous file with comments | « gm/xfermodes3.cpp ('k') | samplecode/SampleDitherBitmap.cpp » ('j') | src/core/SkBitmap.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698