Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: include/core/SkImageInfo.h

Issue 227433009: Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gyp/common.gypi ('K') | « gyp/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkImageInfo.h
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 1c73d959af54d55852516ca369bd933591a22655..7fee31102f820ca75be485b319662160eb0bee77 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -80,12 +80,16 @@ enum SkColorType {
kLastEnum_SkColorType = kIndex_8_SkColorType,
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
scroggo 2014/04/07 21:35:49 In theory we should change this as well. SK_N32_BY
- kPMColor_SkColorType = kBGRA_8888_SkColorType
+ kN32_SkColorType = kBGRA_8888_SkColorType,
scroggo 2014/04/07 21:35:49 I went with your suggesting here, but I'd be happy
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
- kPMColor_SkColorType = kRGBA_8888_SkColorType
+ kN32_SkColorType = kRGBA_8888_SkColorType,
#else
#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
#endif
+
+#ifdef SK_SUPPORT_LEGACY_N32_NAME
reed1 2014/04/08 13:04:57 I suggest we ... 1. don't add a guard until we ha
scroggo 2014/04/08 14:46:29 I 100% agree. I'd like to make the change in anoth
+ kPMColor_SkColorType = kN32_SkColorType
+#endif
};
static int SkColorTypeBytesPerPixel(SkColorType ct) {
« gyp/common.gypi ('K') | « gyp/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698