| commit | d923288e50b5a69afb0bdd5c161191b24cab8345 | [log] [tgz] |
|---|---|---|
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu Apr 10 22:49:20 2014 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu Apr 10 22:49:20 2014 +0000 |
| tree | 9a55b68adb2542c2548359e94ec787994483d5d1 | |
| parent | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 [diff] [blame] |
Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/) Reason for revert: fixes on the chrome side are landing (brettw), keep fingers crossed. Original issue's description: > 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 > > TBR=reed@google.com,scroggo@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia:2384 > > Committed: http://code.google.com/p/skia/source/detail?r=14144 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/233813004 git-svn-id: http://skia.googlecode.com/svn/trunk@14145 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp index 0167d52..dce1069 100644 --- a/tests/BitmapTest.cpp +++ b/tests/BitmapTest.cpp
@@ -25,7 +25,7 @@ // TODO: perhaps skia can relax this, and only require that rowBytes fit // in a uint32_t (or larger), but for now this is the constraint. - info.fColorType = kPMColor_SkColorType; + info.fColorType = kN32_SkColorType; REPORTER_ASSERT(reporter, !bm.setConfig(info)); }