Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
Chrome's side of define changes not easy to figure out quickly. Reverting this for DEPS roll for now.
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/234833003
git-svn-id: http://skia.googlecode.com/svn/trunk@14149 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp
index 080c05f..4769fbb 100644
--- a/samplecode/SampleEncode.cpp
+++ b/samplecode/SampleEncode.cpp
@@ -43,7 +43,7 @@
SkIntToScalar(width)/2, paint);
switch (ct) {
- case kN32_SkColorType:
+ case kPMColor_SkColorType:
bm->swap(device);
break;
case kRGB_565_SkColorType: {
@@ -81,7 +81,7 @@
// configs to build the original bitmap in. Can be at most these 3
static const SkColorType gColorTypes[] = {
- kN32_SkColorType,
+ kPMColor_SkColorType,
kRGB_565_SkColorType,
kIndex_8_SkColorType, // opaque
kIndex_8_SkColorType // alpha