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

Unified Diff: src/core/SkSpriteBlitter_RGB16.cpp

Issue 173893002: use colortype instead of config (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 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 | « src/core/SkSpriteBlitter_ARGB32.cpp ('k') | src/device/xps/SkXPSDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkSpriteBlitter_RGB16.cpp
diff --git a/src/core/SkSpriteBlitter_RGB16.cpp b/src/core/SkSpriteBlitter_RGB16.cpp
index 2bce41e993b7dfe90f183e3f5a2e1b4b6d829ee0..7428c8a74a38b8cf525efbf7c73151eb4cb8a9f6 100644
--- a/src/core/SkSpriteBlitter_RGB16.cpp
+++ b/src/core/SkSpriteBlitter_RGB16.cpp
@@ -324,12 +324,12 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkBitmap& source,
SkSpriteBlitter* blitter = NULL;
unsigned alpha = paint.getAlpha();
- switch (source.config()) {
- case SkBitmap::kARGB_8888_Config:
+ switch (source.colorType()) {
+ case kPMColor_SkColorType:
SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S32_BlitRowProc,
storage, storageSize, (source));
break;
- case SkBitmap::kARGB_4444_Config:
+ case kARGB_4444_SkColorType:
if (255 == alpha) {
SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S4444_Opaque,
storage, storageSize, (source));
@@ -338,7 +338,7 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkBitmap& source,
storage, storageSize, (source, alpha >> 4));
}
break;
- case SkBitmap::kRGB_565_Config:
+ case kRGB_565_SkColorType:
if (255 == alpha) {
SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S16_Opaque,
storage, storageSize, (source));
@@ -347,7 +347,7 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkBitmap& source,
storage, storageSize, (source, alpha));
}
break;
- case SkBitmap::kIndex8_Config:
+ case kIndex_8_SkColorType:
if (paint.isDither()) {
// we don't support dither yet in these special cases
break;
« no previous file with comments | « src/core/SkSpriteBlitter_ARGB32.cpp ('k') | src/device/xps/SkXPSDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698