Rename kPMColor_SkColorType to kN32_SkColorType.

src/images/SkDecodingImageGenerator.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 "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkImageDecoder.h"
@@ skipping 224 matching lines @@
         return NULL;
     }
 
     SkImageInfo info = bitmap.info();
 
     if (!opts.fUseRequestedColorType) {
         // Use default
         if (kIndex_8_SkColorType == bitmap.colorType()) {
             // We don't support kIndex8 because we don't support
             // colortables in this workflow.
-            info.fColorType = kPMColor_SkColorType;
+            info.fColorType = kN32_SkColorType;
         }
     } else {
         if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
             SkASSERT(bitmap.colorType() != opts.fRequestedColorType);
             return NULL;  // Can not translate to needed config.
         }
         info.fColorType = opts.fRequestedColorType;
     }
 
     if (opts.fRequireUnpremul && info.fAlphaType != kOpaque_SkAlphaType) {
@@ skipping 25 matching lines @@
         SkStreamRewindable* stream,
         const SkDecodingImageGenerator::Options& opts) {
     SkASSERT(stream != NULL);
     SkASSERT(stream->unique());
     if ((stream == NULL) || !stream->unique()) {
         SkSafeUnref(stream);
         return NULL;
     }
     return CreateDecodingImageGenerator(NULL, stream, opts);
 }