Rename kPMColor_SkColorType to kN32_SkColorType.

include/core/SkImageInfo.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageInfo_DEFINED
 #define SkImageInfo_DEFINED
 
@@ skipping 61 matching lines @@
     kUnknown_SkColorType,
     kAlpha_8_SkColorType,
     kRGB_565_SkColorType,
     kARGB_4444_SkColorType,
     kRGBA_8888_SkColorType,
     kBGRA_8888_SkColorType,
     kIndex_8_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_BYTE_ORDER? (It appears Chrome
does not use this one, so we can just change it in one CL.)

-    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 with k(N | Native)(32 |
8888)_SkColorType.

8888 follows the convention of the other enums (though 32 follows the convention
of the factories).

Native gives a little more info (again N follows the convention of the
factories).

 #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 have removed all of skia's references to the old
name
2. add the guard in chrome's skia/skia_common.gypi or our
gyp/skia_for_chrome.gypi

[scroggo, 2014/04/08 14:46:29]

I 100% agree. I'd like to make the change in another patch to this CL, but I
want to make sure you like the new name before doing the search and replace.
Done.

+    kPMColor_SkColorType = kN32_SkColorType
+#endif
 };
 
 static int SkColorTypeBytesPerPixel(SkColorType ct) {
     static const uint8_t gSize[] = {
         0,  // Unknown
         1,  // Alpha_8
         2,  // RGB_565
         2,  // ARGB_4444
         4,  // RGBA_8888
         4,  // BGRA_8888
@@ skipping 121 matching lines @@
 
     bool validRowBytes(size_t rowBytes) const {
         uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel());
         return rowBytes >= rb;
     }
 
     SkDEBUGCODE(void validate() const;)
 };
 
 #endif