Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

gm/bitmappremul.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 12 matching lines @@
 static const int PIXEL_SIZE_4444 = SLIDE_SIZE / 16;
 
 static void init_bitmap(SkColorType ct, SkBitmap* bitmap) {
     bitmap->allocPixels(SkImageInfo::Make(SLIDE_SIZE, SLIDE_SIZE, ct,
                                           kPremul_SkAlphaType));
     bitmap->eraseColor(SK_ColorWHITE);
 }
 
 static SkBitmap make_argb8888_gradient() {
     SkBitmap bitmap;
-    init_bitmap(kPMColor_SkColorType, &bitmap);
+    init_bitmap(kN32_SkColorType, &bitmap);
     uint8_t rowColor = 0;
     for (int y = 0; y < SLIDE_SIZE; y++) {
         uint32_t* dst = bitmap.getAddr32(0, y);
         for (int x = 0; x < SLIDE_SIZE; x++) {
             dst[x] = SkPackARGB32(rowColor, rowColor,
                                   rowColor, rowColor);
         }
         if (y % PIXEL_SIZE_8888 == PIXEL_SIZE_8888 - 1) {
             rowColor++;
         }
@@ skipping 13 matching lines @@
         }
         if (y % PIXEL_SIZE_4444 == PIXEL_SIZE_4444 - 1) {
             rowColor++;
         }
     }
     return bitmap;
 }
 
 static SkBitmap make_argb8888_stripes() {
     SkBitmap bitmap;
-    init_bitmap(kPMColor_SkColorType, &bitmap);
+    init_bitmap(kN32_SkColorType, &bitmap);
     uint8_t rowColor = 0;
     for (int y = 0; y < SLIDE_SIZE; y++) {
         uint32_t* dst = bitmap.getAddr32(0, y);
         for (int x = 0; x < SLIDE_SIZE; x++) {
             dst[x] = SkPackARGB32(rowColor, rowColor,
                                   rowColor, rowColor);
         }
         if (rowColor == 0) {
             rowColor = 255;
         } else {
@@ skipping 46 matching lines @@
         canvas->drawBitmap(make_argb8888_stripes(), 0, slideSize);
         canvas->drawBitmap(make_argb4444_stripes(), slideSize, slideSize);
     }
 
 private:
     typedef GM INHERITED;
 };
 
 DEF_GM( return new BitmapPremulGM; )
 }