diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-11 13:47:30 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-11 13:47:30 +0000 |
| commit | 96edc2459820f0f60ea9b57959c1e5018ef95e28 (patch) | |
| tree | 96c92f8d88e4fbc4168e57f88dcd6b913042f52b /dm | |
| parent | 968757e17dafee5dc32fb54d5f10c23307aaaca2 (diff) | |
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
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 4 | ||||
| -rw-r--r-- | dm/DMBenchTask.cpp | 4 | ||||
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -88,7 +88,7 @@ static void kick_off_gms(const SkTDArray<GMRegistry::Factory>& gms, for (int i = 0; i < gms.count(); i++) { for (int j = 0; j < configs.count(); j++) { START("565", CpuGMTask, kRGB_565_SkColorType); - START("8888", CpuGMTask, kN32_SkColorType); + START("8888", CpuGMTask, kPMColor_SkColorType); START("gpu", GpuGMTask, native, 0); START("msaa4", GpuGMTask, native, 4); START("msaa16", GpuGMTask, native, 16); @@ -115,7 +115,7 @@ static void kick_off_benches(const SkTDArray<BenchRegistry::Factory>& benches, for (int j = 0; j < configs.count(); j++) { START("nonrendering", NonRenderingBenchTask); START("565", CpuBenchTask, kRGB_565_SkColorType); - START("8888", CpuBenchTask, kN32_SkColorType); + START("8888", CpuBenchTask, kPMColor_SkColorType); START("gpu", GpuBenchTask, native, 0); START("msaa4", GpuBenchTask, native, 4); START("msaa16", GpuBenchTask, native, 16); diff --git a/dm/DMBenchTask.cpp b/dm/DMBenchTask.cpp index bcedb96f25..c53daf95b4 100644 --- a/dm/DMBenchTask.cpp +++ b/dm/DMBenchTask.cpp @@ -63,7 +63,7 @@ static void draw_raster(SkBenchmark* bench, SkColorType colorType) { } void NonRenderingBenchTask::draw() { - draw_raster(fBench.get(), kN32_SkColorType); + draw_raster(fBench.get(), kPMColor_SkColorType); } void CpuBenchTask::draw() { @@ -73,7 +73,7 @@ void CpuBenchTask::draw() { void GpuBenchTask::draw(GrContextFactory* grFactory) { SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(), fBench->getSize().y(), - kN32_SkColorType, + kPMColor_SkColorType, kPremul_SkAlphaType); SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount)); diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index c72f675660..c4867b6e9e 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -27,7 +27,7 @@ GpuGMTask::GpuGMTask(const char* config, void GpuGMTask::draw(GrContextFactory* grFactory) { SkImageInfo info = SkImageInfo::Make(SkScalarCeilToInt(fGM->width()), SkScalarCeilToInt(fGM->height()), - kN32_SkColorType, + kPMColor_SkColorType, kPremul_SkAlphaType); SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount)); SkCanvas* canvas = surface->getCanvas(); |