aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/tilemodes.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-10 22:36:34 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-10 22:36:34 +0000
commit757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch)
treef1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /gm/tilemodes.cpp
parent4770a3b7a290ee5e44662b8dfbc0bc9196f00930 (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 'gm/tilemodes.cpp')
-rw-r--r--gm/tilemodes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index abecadae9a..5b97f13fc8 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -50,7 +50,7 @@ static void setup(SkPaint* paint, const SkBitmap& bm, bool filter,
}
static const SkColorType gColorTypes[] = {
- kN32_SkColorType,
+ kPMColor_SkColorType,
kRGB_565_SkColorType,
};
@@ -166,7 +166,7 @@ static const int gHeight = 32;
static SkShader* make_bm(SkShader::TileMode tx, SkShader::TileMode ty) {
SkBitmap bm;
- makebm(&bm, kN32_SkColorType, gWidth, gHeight);
+ makebm(&bm, kPMColor_SkColorType, gWidth, gHeight);
return SkShader::CreateBitmapShader(bm, tx, ty);
}