diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:36:34 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:36:34 +0000 |
| commit | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch) | |
| tree | f1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /src/image | |
| parent | 4770a3b7a290ee5e44662b8dfbc0bc9196f00930 (diff) | |
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
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/234243002
git-svn-id: http://skia.googlecode.com/svn/trunk@14144 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImage.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkImagePriv.cpp | 4 | ||||
| -rw-r--r-- | src/image/SkImage_Gpu.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkSurface_Picture.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkSurface_Raster.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 4cbfd81bed..a567c41ca8 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 kN32_SkColorType: + case kPMColor_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 dada230de8..a044aad0a0 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 kN32_SkColorType: + case kPMColor_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 - kN32_SkColorType, // kARGB_8888_Config + kPMColor_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 aa08f44260..475f50ed8a 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, kN32_SkColorType); + return fBitmap.copyTo(dst, kPMColor_SkColorType); } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/image/SkSurface_Picture.cpp b/src/image/SkSurface_Picture.cpp index f7d97acd11..8f65b3eb55 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 = kN32_SkColorType; + info.fColorType = kPMColor_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 74197379ce..e24c0e8699 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 kN32_SkColorType: + case kPMColor_SkColorType: shift = 2; break; default: |