Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/)
Reason for revert:
Want to reland the original CL.
Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144
R=reed@google.com, bensong@google.com
TBR=bensong@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/235523003
git-svn-id: http://skia.googlecode.com/svn/trunk@14156 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 0736e17..7239517 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -346,7 +346,7 @@
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 @@
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 @@
}
break;
case kARGB_4444_SkColorType:
- return sameConfigs || kPMColor_SkColorType == this->colorType();
+ return sameConfigs || kN32_SkColorType == this->colorType();
default:
return false;
}
@@ -1116,7 +1116,7 @@
}
}
} 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) {
diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp
index ba529a7..c2b633e 100644
--- a/src/core/SkBitmapDevice.cpp
+++ b/src/core/SkBitmapDevice.cpp
@@ -45,7 +45,7 @@
case kRGB_565_SkColorType:
canonicalAlphaType = kOpaque_SkAlphaType;
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
break;
default:
return false;
diff --git a/src/core/SkBitmapFilter.cpp b/src/core/SkBitmapFilter.cpp
index 1653cbb..a9c3223 100644
--- a/src/core/SkBitmapFilter.cpp
+++ b/src/core/SkBitmapFilter.cpp
@@ -124,7 +124,7 @@
}
// TODO: consider supporting other colortypes (e.g. 565, A8)
- if (fBitmap->colorType() != kPMColor_SkColorType) {
+ if (fBitmap->colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 9c2c77b..a397b78 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -22,7 +22,7 @@
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
case kIndex_8_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
// if (tx == ty && (kClamp_TileMode == tx || kRepeat_TileMode == tx))
return true;
default:
@@ -130,7 +130,7 @@
flags |= (kHasSpan16_Flag | kIntrinsicly16_Flag);
break;
case kIndex_8_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (bitmapIsOpaque) {
flags |= kHasSpan16_Flag;
}
@@ -279,7 +279,7 @@
}
switch (bm.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
*color = SkUnPreMultiply::PMColorToColor(*bm.getAddr32(0, 0));
return true;
case kRGB_565_SkColorType:
diff --git a/src/core/SkBitmapScaler.cpp b/src/core/SkBitmapScaler.cpp
index 9e8c5fe..599e9d8 100644
--- a/src/core/SkBitmapScaler.cpp
+++ b/src/core/SkBitmapScaler.cpp
@@ -282,7 +282,7 @@
SkAutoLockPixels locker(source);
if (!source.readyToDraw() ||
- source.colorType() != kPMColor_SkColorType) {
+ source.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index 4d70395..52a05ed 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -923,7 +923,7 @@
blitter = SkBlitter_ChooseD565(device, *paint, allocator);
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (shader) {
blitter = allocator->createT<SkARGB32_Shader_Blitter>(device, *paint);
} else if (paint->getColor() == SK_ColorBLACK) {
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index e15e2fc..91a3cd1 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -67,7 +67,7 @@
case kRGB_565_SkColorType:
blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
blitter = SkSpriteBlitter::ChooseD32(source, paint, allocator);
break;
default:
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 8d35eae..b67a657 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2620,7 +2620,7 @@
switch (info.colorType()) {
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
break;
default:
return false;
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 946bf75..7eb0be6 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -188,7 +188,7 @@
*/
SkPMColor pmc = SkPreMultiplyColor(color);
switch (bitmap.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (data) {
*data = pmc;
}
@@ -221,7 +221,7 @@
BitmapXferProc proc, uint32_t procData) {
int shiftPerPixel;
switch (bitmap.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
shiftPerPixel = 2;
break;
case kRGB_565_SkColorType:
@@ -515,7 +515,7 @@
const SkBitmap* bm = blitter->justAnOpaqueColor(&value);
if (bm && kRGB_565_SkColorType == bm->colorType()) {
proc = bw_pt_rect_16_hair_proc;
- } else if (bm && kPMColor_SkColorType == bm->colorType()) {
+ } else if (bm && kN32_SkColorType == bm->colorType()) {
proc = bw_pt_rect_32_hair_proc;
} else {
proc = bw_pt_rect_hair_proc;
diff --git a/src/core/SkScaledImageCache.cpp b/src/core/SkScaledImageCache.cpp
index 1e37884..886b143 100644
--- a/src/core/SkScaledImageCache.cpp
+++ b/src/core/SkScaledImageCache.cpp
@@ -277,7 +277,7 @@
}
// can we relax this?
- if (kPMColor_SkColorType != bitmap->colorType()) {
+ if (kN32_SkColorType != bitmap->colorType()) {
return false;
}
diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index b05e503..a4ae41c 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -20,7 +20,7 @@
class Sprite_D32_S32 : public SkSpriteBlitter {
public:
Sprite_D32_S32(const SkBitmap& src, U8CPU alpha) : INHERITED(src) {
- SkASSERT(src.colorType() == kPMColor_SkColorType);
+ SkASSERT(src.colorType() == kN32_SkColorType);
unsigned flags32 = 0;
if (255 != alpha) {
@@ -289,7 +289,7 @@
blitter = allocator->createT<Sprite_D32_S4444>(source);
}
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (xfermode || filter) {
if (255 == alpha) {
// this can handle xfermode or filter, but not alpha
diff --git a/src/core/SkSpriteBlitter_RGB16.cpp b/src/core/SkSpriteBlitter_RGB16.cpp
index 74c1961..3f712bb 100644
--- a/src/core/SkSpriteBlitter_RGB16.cpp
+++ b/src/core/SkSpriteBlitter_RGB16.cpp
@@ -325,7 +325,7 @@
unsigned alpha = paint.getAlpha();
switch (source.colorType()) {
- case kPMColor_SkColorType: {
+ case kN32_SkColorType: {
blitter = allocator->createT<Sprite_D16_S32_BlitRowProc>(source);
break;
}