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;
}
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index f938ba6..205e9a9 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -306,9 +306,9 @@
bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src,
const Context& ctx, SkBitmap* dst,
SkIPoint* offset) const {
- SkASSERT(src.colorType() == kPMColor_SkColorType);
+ SkASSERT(src.colorType() == kN32_SkColorType);
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/effects/SkBicubicImageFilter.cpp b/src/effects/SkBicubicImageFilter.cpp
index eabf066..8f78ff2 100644
--- a/src/effects/SkBicubicImageFilter.cpp
+++ b/src/effects/SkBicubicImageFilter.cpp
@@ -91,7 +91,7 @@
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp
index 363691a..63990ab 100644
--- a/src/effects/SkBlurImageFilter.cpp
+++ b/src/effects/SkBlurImageFilter.cpp
@@ -149,7 +149,7 @@
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 0200cab..3922244 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -205,8 +205,8 @@
(displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) {
return false;
}
- if ((displ.colorType() != kPMColor_SkColorType) ||
- (color.colorType() != kPMColor_SkColorType)) {
+ if ((displ.colorType() != kN32_SkColorType) ||
+ (color.colorType() != kN32_SkColorType)) {
return false;
}
SkIRect bounds;
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 09ceef0..b485ae1 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -943,7 +943,7 @@
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
SkIRect bounds;
@@ -1034,7 +1034,7 @@
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 51ade99..5096640 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -282,11 +282,11 @@
bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
const Context&, SkBitmap* dst,
SkIPoint* offset) const {
- SkASSERT(src.colorType() == kPMColor_SkColorType);
+ SkASSERT(src.colorType() == kN32_SkColorType);
SkASSERT(fSrcRect.width() < src.width());
SkASSERT(fSrcRect.height() < src.height());
- if ((src.colorType() != kPMColor_SkColorType) ||
+ if ((src.colorType() != kN32_SkColorType) ||
(fSrcRect.width() >= src.width()) ||
(fSrcRect.height() >= src.height())) {
return false;
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index 7b9812d..878cbae 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -260,7 +260,7 @@
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index fb69758..2350e6c 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -149,7 +149,7 @@
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp
index b6a5e1e..bd8b99a 100644
--- a/src/effects/SkTransparentShader.cpp
+++ b/src/effects/SkTransparentShader.cpp
@@ -29,7 +29,7 @@
if (fAlpha == 255)
flags |= kOpaqueAlpha_Flag;
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (fAlpha == 255 && fDevice->isOpaque())
flags |= kOpaqueAlpha_Flag;
break;
@@ -43,7 +43,7 @@
unsigned scale = SkAlpha255To256(fAlpha);
switch (fDevice->colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (scale == 256) {
SkPMColor* src = fDevice->getAddr32(x, y);
if (src != span) {
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index b1fa560..2ebb9c7 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -517,7 +517,7 @@
info.fWidth = kCache32Count;
info.fHeight = 4; // for our 4 dither rows
info.fAlphaType = kPremul_SkAlphaType;
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
if (NULL == fCache32PixelRef) {
fCache32PixelRef = SkMallocPixelRef::NewAllocate(info, 0, NULL);
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 7c804ab..08d4411 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -229,7 +229,7 @@
if (kRGB_565_SkColorType == info.colorType()) {
info.fAlphaType = kOpaque_SkAlphaType; // force this setting
} else {
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
if (kOpaque_SkAlphaType != info.alphaType()) {
info.fAlphaType = kPremul_SkAlphaType; // force this setting
}
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index db46b86..754a7be 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -43,7 +43,7 @@
dstPI.fRowBytes = count * sizeof(SkPMColor);
SkSrcPixelInfo srcPI;
- srcPI.fColorType = kPMColor_SkColorType;
+ srcPI.fColorType = kN32_SkColorType;
srcPI.fAlphaType = kPremul_SkAlphaType;
srcPI.fPixels = ctable->lockColors();
srcPI.fRowBytes = count * sizeof(SkPMColor);
@@ -166,7 +166,7 @@
return result;
}
} else {
- origBitmap.copyTo(&tmpBitmap, kPMColor_SkColorType);
+ origBitmap.copyTo(&tmpBitmap, kN32_SkColorType);
// now bitmap points to our temp, which has been promoted to 32bits
bitmap = &tmpBitmap;
desc.fConfig = SkBitmapConfig2GrPixelConfig(bitmap->config());
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index a567c41..4cbfd81 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -90,7 +90,7 @@
static bool raster_canvas_supports(const SkImageInfo& info) {
switch (info.fColorType) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
return kUnpremul_SkAlphaType != info.fAlphaType;
case kRGB_565_SkColorType:
return true;
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp
index a044aad..dada230 100644
--- a/src/image/SkImagePriv.cpp
+++ b/src/image/SkImagePriv.cpp
@@ -20,7 +20,7 @@
case kRGB_565_SkColorType:
return SkBitmap::kRGB_565_Config;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
return SkBitmap::kARGB_8888_Config;
case kIndex_8_SkColorType:
@@ -44,7 +44,7 @@
kIndex_8_SkColorType, // kIndex8_Config
kRGB_565_SkColorType, // kRGB_565_Config
kARGB_4444_SkColorType, // kARGB_4444_Config
- kPMColor_SkColorType, // kARGB_8888_Config
+ kN32_SkColorType, // kARGB_8888_Config
};
SkASSERT((unsigned)config < SK_ARRAY_COUNT(gCT));
return gCT[config];
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 475f50e..aa08f44 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -59,7 +59,7 @@
}
bool SkImage_Gpu::getROPixels(SkBitmap* dst) const {
- return fBitmap.copyTo(dst, kPMColor_SkColorType);
+ return fBitmap.copyTo(dst, kN32_SkColorType);
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/image/SkSurface_Picture.cpp b/src/image/SkSurface_Picture.cpp
index 8f65b3e..f7d97ac 100644
--- a/src/image/SkSurface_Picture.cpp
+++ b/src/image/SkSurface_Picture.cpp
@@ -62,7 +62,7 @@
} else {
SkImageInfo info;
info.fWidth = info.fHeight = 0;
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
info.fAlphaType = kOpaque_SkAlphaType;
return SkImage::NewRasterCopy(info, NULL, 0);
}
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index e24c0e8..7419737 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -47,7 +47,7 @@
case kRGB_565_SkColorType:
shift = 1;
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
shift = 2;
break;
default:
diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
index 5b842ab..b3924a7 100644
--- a/src/images/SkDecodingImageGenerator.cpp
+++ b/src/images/SkDecodingImageGenerator.cpp
@@ -242,7 +242,7 @@
if (kIndex_8_SkColorType == bitmap.colorType()) {
// We don't support kIndex8 because we don't support
// colortables in this workflow.
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
}
} else {
if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index c61ce98..c683752 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -209,7 +209,7 @@
// <Error>: CGImageDestinationFinalize image destination does not have enough images
// So instead we copy to 8888.
if (bm.colorType() == kARGB_4444_SkColorType) {
- bm.copyTo(&bitmap8888, kPMColor_SkColorType);
+ bm.copyTo(&bitmap8888, kN32_SkColorType);
bmPtr = &bitmap8888;
}
type = kUTTypePNG;
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index 9d54794..74b2c39 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -306,10 +306,10 @@
//Convert to 8888 if needed.
const SkBitmap* bitmap;
SkBitmap bitmapCopy;
- if (kPMColor_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
+ if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
bitmap = &bitmapOrig;
} else {
- if (!bitmapOrig.copyTo(&bitmapCopy, kPMColor_SkColorType)) {
+ if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) {
return false;
}
bitmap = &bitmapCopy;
diff --git a/src/utils/SkBitmapHasher.cpp b/src/utils/SkBitmapHasher.cpp
index 6c861cd..bd038dd 100644
--- a/src/utils/SkBitmapHasher.cpp
+++ b/src/utils/SkBitmapHasher.cpp
@@ -57,7 +57,7 @@
// Hmm, that didn't work. Maybe if we create a new
// kARGB_8888_Config version of the bitmap it will work better?
SkBitmap copyBitmap;
- if (!bitmap.copyTo(©Bitmap, kPMColor_SkColorType)) {
+ if (!bitmap.copyTo(©Bitmap, kN32_SkColorType)) {
return false;
}
return ComputeDigestInternal(copyBitmap, result);
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp
index c5b558a..64f62dd 100644
--- a/src/utils/SkCanvasStateUtils.cpp
+++ b/src/utils/SkCanvasStateUtils.cpp
@@ -223,7 +223,7 @@
layerState->height = bitmap.height();
switch (bitmap.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
layerState->raster.config = kARGB_8888_RasterConfig;
break;
case kRGB_565_SkColorType:
@@ -281,7 +281,7 @@
SkBitmap bitmap;
SkColorType colorType =
- layerState.raster.config == kARGB_8888_RasterConfig ? kPMColor_SkColorType :
+ layerState.raster.config == kARGB_8888_RasterConfig ? kN32_SkColorType :
layerState.raster.config == kRGB_565_RasterConfig ? kRGB_565_SkColorType :
kUnknown_SkColorType;
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index 7687c3c..00166e9 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -34,7 +34,7 @@
*upscaleTo32 = true;
}
// fall through
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
*bitsPerComponent = 8;
#if SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
*info = kCGBitmapByteOrder32Big;
@@ -94,7 +94,7 @@
copy = new SkBitmap;
// here we make a ceep copy of the pixels, since CG won't take our
// 565 directly
- bm.copyTo(copy, kPMColor_SkColorType);
+ bm.copyTo(copy, kN32_SkColorType);
} else {
copy = new SkBitmap(bm);
}
diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp
index cca291a..8f6b96f 100644
--- a/src/views/SkWindow.cpp
+++ b/src/views/SkWindow.cpp
@@ -53,7 +53,7 @@
#ifdef SK_BUILD_FOR_WINCE
fColorType = kRGB_565_SkColorType;
#else
- fColorType = kPMColor_SkColorType;
+ fColorType = kN32_SkColorType;
#endif
fMatrix.reset();
diff --git a/src/views/mac/SkNSView.mm b/src/views/mac/SkNSView.mm
index 1014ffe..80bfd67 100644
--- a/src/views/mac/SkNSView.mm
+++ b/src/views/mac/SkNSView.mm
@@ -57,7 +57,7 @@
size = [self convertSizeToBacking:self.frame.size];
#endif
fWind->resize((int) size.width, (int) size.height,
- kPMColor_SkColorType);
+ kN32_SkColorType);
}
}