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/CanvasStateTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/CanvasStateTest.cpp') diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 5c7e4738c2..212b14ab3e 100644 --- a/tests/CanvasStateTest.cpp +++ b/tests/CanvasStateTest.cpp @@ -26,7 +26,7 @@ static void test_complex_layers(skiatest::Reporter* reporter) { SkIntToScalar((HEIGHT-(2*SPACER)) / 7)); const SkColorType colorTypes[] = { - kRGB_565_SkColorType, kN32_SkColorType + kRGB_565_SkColorType, kPMColor_SkColorType }; const int configCount = sizeof(colorTypes) / sizeof(SkBitmap::Config); -- cgit v1.2.3