aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/BitmapGetColorTest.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 /tests/BitmapGetColorTest.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 'tests/BitmapGetColorTest.cpp')
-rw-r--r--tests/BitmapGetColorTest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index bf6ebcb5cf..28f3cb309d 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -22,9 +22,9 @@ DEF_TEST(GetColor, reporter) {
{ kAlpha_8_SkColorType, 0, 0 },
{ kRGB_565_SkColorType, 0xFF00FF00, 0xFF00FF00 },
{ kRGB_565_SkColorType, 0xFFFF00FF, 0xFFFF00FF },
- { kN32_SkColorType, 0xFFFFFFFF, 0xFFFFFFFF },
- { kN32_SkColorType, 0, 0 },
- { kN32_SkColorType, 0xFF224466, 0xFF224466 },
+ { kPMColor_SkColorType, 0xFFFFFFFF, 0xFFFFFFFF },
+ { kPMColor_SkColorType, 0, 0 },
+ { kPMColor_SkColorType, 0xFF224466, 0xFF224466 },
};
// specify an area that doesn't touch (0,0) and may extend beyond the