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 /samplecode/SampleApp.cpp | |
| 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 '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 050fc4aa8c..c8fbf3dd15 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(kN32_SkColorType); + this->setColorType(kPMColor_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, 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 @@ static SkColorType gColorTypeCycle[] = { 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 |