diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:49:20 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:49:20 +0000 |
commit | d923288e50b5a69afb0bdd5c161191b24cab8345 (patch) | |
tree | 9a55b68adb2542c2548359e94ec787994483d5d1 /src/core | |
parent | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (diff) |
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
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkBitmap.cpp | 8 | ||||
-rw-r--r-- | src/core/SkBitmapDevice.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBitmapFilter.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBitmapProcShader.cpp | 6 | ||||
-rw-r--r-- | src/core/SkBitmapScaler.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBlitter.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBlitter_Sprite.cpp | 2 | ||||
-rw-r--r-- | src/core/SkCanvas.cpp | 2 | ||||
-rw-r--r-- | src/core/SkDraw.cpp | 6 | ||||
-rw-r--r-- | src/core/SkScaledImageCache.cpp | 2 | ||||
-rw-r--r-- | src/core/SkSpriteBlitter_ARGB32.cpp | 4 | ||||
-rw-r--r-- | src/core/SkSpriteBlitter_RGB16.cpp | 2 |
12 files changed, 20 insertions, 20 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 0736e17ff3..72395172da 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) { diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index ba529a766b..c2b633e1a6 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -45,7 +45,7 @@ static bool valid_for_bitmap_device(const SkImageInfo& info, 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 1653cbb20e..a9c3223fbc 100644 --- a/src/core/SkBitmapFilter.cpp +++ b/src/core/SkBitmapFilter.cpp @@ -124,7 +124,7 @@ bool SkBitmapProcState::setBitmapFilterProcs() { } // 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 9c2c77b950..a397b78439 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -22,7 +22,7 @@ bool SkBitmapProcShader::CanDo(const SkBitmap& bm, TileMode tx, TileMode ty) { 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 @@ bool SkBitmapProcShader::setContext(const SkBitmap& device, 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 @@ static bool canUseColorShader(const SkBitmap& bm, SkColor* color) { } 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 9e8c5feef0..599e9d8eb5 100644 --- a/src/core/SkBitmapScaler.cpp +++ b/src/core/SkBitmapScaler.cpp @@ -282,7 +282,7 @@ bool SkBitmapScaler::Resize(SkBitmap* resultPtr, 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 4d70395e52..52a05eded8 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -923,7 +923,7 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device, 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 e15e2fcde4..91a3cd1fee 100644 --- a/src/core/SkBlitter_Sprite.cpp +++ b/src/core/SkBlitter_Sprite.cpp @@ -67,7 +67,7 @@ SkBlitter* SkBlitter::ChooseSprite(const SkBitmap& device, const SkPaint& paint, 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 c16ac9a09f..27b7a4c804 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2613,7 +2613,7 @@ static bool supported_for_raster_canvas(const SkImageInfo& info) { 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 946bf75310..7eb0be6b6b 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -188,7 +188,7 @@ static BitmapXferProc ChooseBitmapXferProc(const SkBitmap& bitmap, */ SkPMColor pmc = SkPreMultiplyColor(color); switch (bitmap.colorType()) { - case kPMColor_SkColorType: + case kN32_SkColorType: if (data) { *data = pmc; } @@ -221,7 +221,7 @@ static void CallBitmapXferProc(const SkBitmap& bitmap, const SkIRect& rect, 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 @@ PtProcRec::Proc PtProcRec::chooseProc(SkBlitter** blitterPtr) { 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 1e37884c31..886b1438ca 100644 --- a/src/core/SkScaledImageCache.cpp +++ b/src/core/SkScaledImageCache.cpp @@ -277,7 +277,7 @@ bool SkScaledImageCacheDiscardableAllocator::allocPixelRef(SkBitmap* bitmap, } // 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 b05e5033e4..a4ae41c689 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 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseD32(const SkBitmap& source, const SkPain 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 74c1961dbd..3f712bb3ec 100644 --- a/src/core/SkSpriteBlitter_RGB16.cpp +++ b/src/core/SkSpriteBlitter_RGB16.cpp @@ -325,7 +325,7 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkBitmap& source, const SkPain unsigned alpha = paint.getAlpha(); switch (source.colorType()) { - case kPMColor_SkColorType: { + case kN32_SkColorType: { blitter = allocator->createT<Sprite_D16_S32_BlitRowProc>(source); break; } |