Reland kPMColor_SkColorType to kN32_SkColorType.

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 2602 matching lines @@
         case kPremul_SkAlphaType:
         case kOpaque_SkAlphaType:
             break;
         default:
             return false;
     }
 
     switch (info.colorType()) {
         case kAlpha_8_SkColorType:
         case kRGB_565_SkColorType:
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             break;
         default:
             return false;
     }
 
     return true;
 }
 
 SkCanvas* SkCanvas::NewRaster(const SkImageInfo& info) {
     if (!supported_for_raster_canvas(info)) {
@@ skipping 21 matching lines @@
     if (!bitmap.installPixels(info, pixels, rowBytes)) {
         return NULL;
     }
 
     // should this functionality be moved into allocPixels()?
     if (!bitmap.info().isOpaque()) {
         bitmap.eraseColor(0);
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }