Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/image/SkSurface_Picture.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 "SkCanvas.h"
 #include "SkImagePriv.h"
@@ skipping 44 matching lines @@
 SkSurface* SkSurface_Picture::onNewSurface(const SkImageInfo& info) {
     return SkSurface::NewPicture(info.fWidth, info.fHeight);
 }
 
 SkImage* SkSurface_Picture::onNewImageSnapshot() {
     if (fPicture) {
         return SkNewImageFromPicture(fPicture);
     } else {
         SkImageInfo info;
         info.fWidth = info.fHeight = 0;
-        info.fColorType = kPMColor_SkColorType;
+        info.fColorType = kN32_SkColorType;
         info.fAlphaType = kOpaque_SkAlphaType;
         return SkImage::NewRasterCopy(info, NULL, 0);
     }
 }
 
 void SkSurface_Picture::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
                                const SkPaint* paint) {
     if (!fPicture) {
         return;
     }
@@ skipping 17 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
 SkSurface* SkSurface::NewPicture(int width, int height) {
     if ((width | height) < 0) {
         return NULL;
     }
 
     return SkNEW_ARGS(SkSurface_Picture, (width, height));
 }