Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/utils/mac/SkCreateCGImageRef.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkCGUtils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 16 matching lines @@
 #if 0
             // doesn't see quite right. Are they thinking 1555?
             *bitsPerComponent = 5;
             *info = kCGBitmapByteOrder16Little | kCGImageAlphaNone;
             break;
 #endif
             if (upscaleTo32) {
                 *upscaleTo32 = true;
             }
             // fall through
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             *bitsPerComponent = 8;
 #if SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
             *info = kCGBitmapByteOrder32Big;
             if (bm.isOpaque()) {
                 *info |= kCGImageAlphaNoneSkipLast;
             } else {
                 *info |= kCGImageAlphaPremultipliedLast;
             }
 #elif SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
             // Matches the CGBitmapInfo that Apple recommends for best
@@ skipping 39 matching lines @@
     bool upscaleTo32;
     if (!getBitmapInfo(bm, bitsPerComponent, info, &upscaleTo32)) {
         return NULL;
     }
 
     SkBitmap* copy;
     if (upscaleTo32) {
         copy = new SkBitmap;
         // here we make a ceep copy of the pixels, since CG won't take our
         // 565 directly
-        bm.copyTo(copy, kPMColor_SkColorType);
+        bm.copyTo(copy, kN32_SkColorType);
     } else {
         copy = new SkBitmap(bm);
     }
     return copy;
 }
 
 CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm,
                                             CGColorSpaceRef colorSpace) {
     size_t bitsPerComponent SK_INIT_TO_AVOID_WARNING;
     CGBitmapInfo info       SK_INIT_TO_AVOID_WARNING;
@@ skipping 116 matching lines @@
     CGColorSpaceRelease(cs);
 
     if (ctx) {
         CGContextDrawPDFPage(ctx, page);
         CGContextRelease(ctx);
     }
 
     output->swap(bitmap);
     return true;
 }