Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/image/SkImage_Gpu.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 "SkImage_Base.h"
 #include "SkImagePriv.h"
 #include "SkBitmap.h"
@@ skipping 41 matching lines @@
 void SkImage_Gpu::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
                          const SkPaint* paint) {
     canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
 }
 
 GrTexture* SkImage_Gpu::onGetTexture() {
     return fBitmap.getTexture();
 }
 
 bool SkImage_Gpu::getROPixels(SkBitmap* dst) const {
-    return fBitmap.copyTo(dst, kPMColor_SkColorType);
+    return fBitmap.copyTo(dst, kN32_SkColorType);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkImage* SkImage::NewTexture(const SkBitmap& bitmap) {
     if (NULL == bitmap.getTexture()) {
         return NULL;
     }
 
     return SkNEW_ARGS(SkImage_Gpu, (bitmap));
 }
 
 GrTexture* SkTextureImageGetTexture(SkImage* image) {
     return ((SkImage_Gpu*)image)->getTexture();
 }