use SkColorType instead of SkBitmap::Config in views/effects
R=scroggo@google.com, reed@google.com
TBR=scroggo
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/168843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13469 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp
index 1d7e808..9de4a0c 100644
--- a/src/effects/SkTransparentShader.cpp
+++ b/src/effects/SkTransparentShader.cpp
@@ -23,13 +23,13 @@
uint32_t SkTransparentShader::getFlags() {
uint32_t flags = this->INHERITED::getFlags();
- switch (fDevice->config()) {
- case SkBitmap::kRGB_565_Config:
+ switch (fDevice->colorType()) {
+ case kRGB_565_SkColorType:
flags |= kHasSpan16_Flag;
if (fAlpha == 255)
flags |= kOpaqueAlpha_Flag;
break;
- case SkBitmap::kARGB_8888_Config:
+ case kPMColor_SkColorType:
if (fAlpha == 255 && fDevice->isOpaque())
flags |= kOpaqueAlpha_Flag;
break;
@@ -42,8 +42,8 @@
void SkTransparentShader::shadeSpan(int x, int y, SkPMColor span[], int count) {
unsigned scale = SkAlpha255To256(fAlpha);
- switch (fDevice->config()) {
- case SkBitmap::kARGB_8888_Config:
+ switch (fDevice->colorType()) {
+ case kPMColor_SkColorType:
if (scale == 256) {
SkPMColor* src = fDevice->getAddr32(x, y);
if (src != span) {
@@ -56,7 +56,7 @@
}
}
break;
- case SkBitmap::kRGB_565_Config: {
+ case kRGB_565_SkColorType: {
const uint16_t* src = fDevice->getAddr16(x, y);
if (scale == 256) {
for (int i = count - 1; i >= 0; --i) {
@@ -78,10 +78,7 @@
}
break;
}
- case SkBitmap::kIndex8_Config:
- SkDEBUGFAIL("index8 not supported as a destination device");
- break;
- case SkBitmap::kA8_Config: {
+ case kAlpha_8_SkColorType: {
const uint8_t* src = fDevice->getAddr8(x, y);
if (scale == 256) {
for (int i = count - 1; i >= 0; --i) {
@@ -94,13 +91,14 @@
}
break;
}
- default: // to avoid warnings
+ default:
+ SkDEBUGFAIL("colorType not supported as a destination device");
break;
}
}
void SkTransparentShader::shadeSpan16(int x, int y, uint16_t span[], int count) {
- SkASSERT(fDevice->config() == SkBitmap::kRGB_565_Config);
+ SkASSERT(fDevice->colorType() == kRGB_565_SkColorType);
uint16_t* src = fDevice->getAddr16(x, y);
if (src != span) {