Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/image/SkImage.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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkImagePriv.h"
@@ skipping 72 matching lines @@
     if (as_IB(this)->getROPixels(&bm)) {
         return SkImageEncoder::EncodeData(bm, type, quality);
     }
     return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool raster_canvas_supports(const SkImageInfo& info) {
     switch (info.fColorType) {
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             return kUnpremul_SkAlphaType != info.fAlphaType;
         case kRGB_565_SkColorType:
             return true;
         case kAlpha_8_SkColorType:
             return true;
         default:
             break;
     }
     return false;
 }
@@ skipping 25 matching lines @@
 
     SkCanvas canvas(*bitmap);
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kClear_Mode);
     canvas.drawRect(dstR, paint);
 
     const_cast<SkImage_Base*>(this)->onDrawRectToRect(&canvas, &srcR, dstR, NULL);
     return true;
 }