From 96edc2459820f0f60ea9b57959c1e5018ef95e28 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 11 Apr 2014 13:47:30 +0000 Subject: 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 --- tests/BitmapGetColorTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/BitmapGetColorTest.cpp') 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 -- cgit v1.2.3