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/SampleApp.cpp b/samplecode/SampleApp.cpp
index 050fc4a..c8fbf3d 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -958,7 +958,7 @@
fSlideMenu = new SkOSMenu;
this->addMenu(fSlideMenu);
- this->setColorType(kN32_SkColorType);
+ this->setColorType(kPMColor_SkColorType);
this->setVisibleP(true);
this->setClipToBounds(false);
@@ -1449,7 +1449,7 @@
SkBaseDevice* device = orig->getDevice();
SkBitmap bmp;
- if (device->accessBitmap(false).copyTo(&bmp, kN32_SkColorType)) {
+ if (device->accessBitmap(false).copyTo(&bmp, kPMColor_SkColorType)) {
static int gSampleGrabCounter;
SkString name;
name.printf("sample_grab_%d.png", gSampleGrabCounter++);
@@ -1552,7 +1552,7 @@
kUnknown_SkColorType, // none -> none
kUnknown_SkColorType, // a8 -> none
kARGB_4444_SkColorType, // 565 -> 4444
- kN32_SkColorType, // 4444 -> 8888
+ kPMColor_SkColorType, // 4444 -> 8888
kRGB_565_SkColorType, // 8888 -> 565
kRGB_565_SkColorType, // 8888 -> 565
kUnknown_SkColorType, // index8 -> none