diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
| commit | 149e9a107c356b0151433fb23c2b1c8d0634947c (patch) | |
| tree | 7db3bbc9bba71665f1d0c2720c98682afcda2bda /samplecode/SampleApp.cpp | |
| parent | 2a6f221bf8cea98bd7b44b02ce5c13a6b334a70d (diff) | |
Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means.
BUG=skia:2384
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/227433009
git-svn-id: http://skia.googlecode.com/svn/trunk@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index c8fbf3dd15..050fc4aa8c 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -958,7 +958,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fSlideMenu = new SkOSMenu; this->addMenu(fSlideMenu); - this->setColorType(kPMColor_SkColorType); + this->setColorType(kN32_SkColorType); this->setVisibleP(true); this->setClipToBounds(false); @@ -1449,7 +1449,7 @@ void SampleWindow::afterChildren(SkCanvas* orig) { SkBaseDevice* device = orig->getDevice(); SkBitmap bmp; - if (device->accessBitmap(false).copyTo(&bmp, kPMColor_SkColorType)) { + if (device->accessBitmap(false).copyTo(&bmp, kN32_SkColorType)) { static int gSampleGrabCounter; SkString name; name.printf("sample_grab_%d.png", gSampleGrabCounter++); @@ -1552,7 +1552,7 @@ static SkColorType gColorTypeCycle[] = { kUnknown_SkColorType, // none -> none kUnknown_SkColorType, // a8 -> none kARGB_4444_SkColorType, // 565 -> 4444 - kPMColor_SkColorType, // 4444 -> 8888 + kN32_SkColorType, // 4444 -> 8888 kRGB_565_SkColorType, // 8888 -> 565 kRGB_565_SkColorType, // 8888 -> 565 kUnknown_SkColorType, // index8 -> none |