From d923288e50b5a69afb0bdd5c161191b24cab8345 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 10 Apr 2014 22:49:20 +0000 Subject: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/) Reason for revert: fixes on the chrome side are landing (brettw), keep fingers crossed. 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, scroggo@google.com TBR=reed@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true BUG=skia:2384 Author: bensong@google.com Review URL: https://codereview.chromium.org/233813004 git-svn-id: http://skia.googlecode.com/svn/trunk@14145 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/image/SkImage.cpp | 2 +- src/image/SkImagePriv.cpp | 4 ++-- src/image/SkImage_Gpu.cpp | 2 +- src/image/SkSurface_Picture.cpp | 2 +- src/image/SkSurface_Raster.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/image') diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index a567c41ca8..4cbfd81bed 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -90,7 +90,7 @@ SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { 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 a044aad0a0..dada230de8 100644 --- a/src/image/SkImagePriv.cpp +++ b/src/image/SkImagePriv.cpp @@ -20,7 +20,7 @@ SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType colorType) { 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 @@ SkColorType SkBitmapConfigToColorType(SkBitmap::Config config) { 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 475f50ed8a..aa08f44260 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -59,7 +59,7 @@ GrTexture* SkImage_Gpu::onGetTexture() { } 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 8f65b3eb55..f7d97acd11 100644 --- a/src/image/SkSurface_Picture.cpp +++ b/src/image/SkSurface_Picture.cpp @@ -62,7 +62,7 @@ SkImage* SkSurface_Picture::onNewImageSnapshot() { } 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 e24c0e8699..74197379ce 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -47,7 +47,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) { case kRGB_565_SkColorType: shift = 1; break; - case kPMColor_SkColorType: + case kN32_SkColorType: shift = 2; break; default: -- cgit v1.2.3