Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/gpu/SkGpuDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "effects/GrBicubicEffect.h"
@@ skipping 211 matching lines @@
         origInfo.width() < 0 || origInfo.height() < 0) {
         return NULL;
     }
 
     SkImageInfo info = origInfo;
     // TODO: perhas we can loosen this check now that colortype is more detailed
     // e.g. can we support both RGBA and BGRA here?
     if (kRGB_565_SkColorType == info.colorType()) {
         info.fAlphaType = kOpaque_SkAlphaType;  // force this setting
     } else {
-        info.fColorType = kPMColor_SkColorType;
+        info.fColorType = kN32_SkColorType;
         if (kOpaque_SkAlphaType != info.alphaType()) {
             info.fAlphaType = kPremul_SkAlphaType;  // force this setting
         }
     }
 
     GrTextureDesc desc;
     desc.fFlags = kRenderTarget_GrTextureFlagBit;
     desc.fWidth = info.width();
     desc.fHeight = info.height();
     desc.fConfig = SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType());
@@ skipping 1730 matching lines @@
             const GrAtlasedLayer* layer = fContext->getLayerCache()->findLayerOrCreate(picture, i);
 
             SkDebugf("%d (%d), ", i, layer->layerID());
         }
     }
     SkDebugf("\n");
 #endif
 
     return false;
 }