Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/utils/SkCanvasStateUtils.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 "SkCanvasStateUtils.h"
 
 #include "SkBitmapDevice.h"
@@ skipping 205 matching lines @@
 
         SkCanvasLayerState* layerState =
                 (SkCanvasLayerState*) layerWriter.reserve(sizeof(SkCanvasLayerState));
         layerState->type = kRaster_CanvasBackend;
         layerState->x = layer.x();
         layerState->y = layer.y();
         layerState->width = bitmap.width();
         layerState->height = bitmap.height();
 
         switch (bitmap.colorType()) {
-            case kN32_SkColorType:
+            case kPMColor_SkColorType:
                 layerState->raster.config = kARGB_8888_RasterConfig;
                 break;
             case kRGB_565_SkColorType:
                 layerState->raster.config = kRGB_565_RasterConfig;
                 break;
             default:
                 return NULL;
         }
         layerState->raster.rowBytes = bitmap.rowBytes();
         layerState->raster.pixels = bitmap.getPixels();
@@ skipping 37 matching lines @@
 
     canvas->setMatrix(matrix);
     canvas->setClipRegion(clip);
 }
 
 static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layerState) {
     SkASSERT(kRaster_CanvasBackend == layerState.type);
 
     SkBitmap bitmap;
     SkColorType colorType =
-        layerState.raster.config == kARGB_8888_RasterConfig ? kN32_SkColorType :
+        layerState.raster.config == kARGB_8888_RasterConfig ? kPMColor_SkColorType :
         layerState.raster.config == kRGB_565_RasterConfig ? kRGB_565_SkColorType :
         kUnknown_SkColorType;
 
     if (colorType == kUnknown_SkColorType) {
         return NULL;
     }
 
     bitmap.installPixels(SkImageInfo::Make(layerState.width, layerState.height,
                                            colorType, kPremul_SkAlphaType),
                          layerState.raster.pixels, layerState.raster.rowBytes,
@@ skipping 39 matching lines @@
     }
 
     return canvas.detach();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void SkCanvasStateUtils::ReleaseCanvasState(SkCanvasState* state) {
     SkDELETE(state);
 }