Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/image/SkSurface_Raster.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSurface_Base.h"
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
@@ skipping 29 matching lines @@
     static const size_t kMaxTotalSize = SK_MaxS32;
 
     int shift = 0;
     switch (info.fColorType) {
         case kAlpha_8_SkColorType:
             shift = 0;
             break;
         case kRGB_565_SkColorType:
             shift = 1;
             break;
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             shift = 2;
             break;
         default:
             return false;
     }
 
     if (kIgnoreRowBytesValue == rowBytes) {
         return true;
     }
 
@@ skipping 91 matching lines @@
     if (!SkSurface_Raster::Valid(info)) {
         return NULL;
     }
 
     SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, 0, NULL));
     if (NULL == pr.get()) {
         return NULL;
     }
     return SkNEW_ARGS(SkSurface_Raster, (pr));
 }