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

Unified Diff: src/core/SkBitmap.cpp

Issue 227433009: Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 8 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 | « samplecode/SampleTiling.cpp ('k') | src/core/SkBitmapDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmap.cpp
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 0736e17ff33265af5b7dc565d08d90939795c74b..72395172dace5fdffc5b31ee71f41787de7915ca 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -346,7 +346,7 @@ static bool config_to_colorType(SkBitmap::Config config, SkColorType* ctOut) {
ct = kARGB_4444_SkColorType;
break;
case SkBitmap::kARGB_8888_Config:
- ct = kPMColor_SkColorType;
+ ct = kN32_SkColorType;
break;
case SkBitmap::kNo_Config:
default:
@@ -997,7 +997,7 @@ bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
switch (dstColorType) {
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
break;
case kIndex_8_SkColorType:
if (!sameConfigs) {
@@ -1005,7 +1005,7 @@ bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
}
break;
case kARGB_4444_SkColorType:
- return sameConfigs || kPMColor_SkColorType == this->colorType();
+ return sameConfigs || kN32_SkColorType == this->colorType();
default:
return false;
}
@@ -1116,7 +1116,7 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType,
}
}
} else if (kARGB_4444_SkColorType == dstColorType
- && kPMColor_SkColorType == src->colorType()) {
+ && kN32_SkColorType == src->colorType()) {
SkASSERT(src->height() == tmpDst.height());
SkASSERT(src->width() == tmpDst.width());
for (int y = 0; y < src->height(); ++y) {
« no previous file with comments | « samplecode/SampleTiling.cpp ('k') | src/core/SkBitmapDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698