Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/gpu/SkGr.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGr.h"
 #include "SkConfig8888.h"
 #include "SkMessageBus.h"
@@ skipping 25 matching lines @@
 
     const int count = ctable->count();
 
     SkDstPixelInfo dstPI;
     dstPI.fColorType = kRGBA_8888_SkColorType;
     dstPI.fAlphaType = kPremul_SkAlphaType;
     dstPI.fPixels = buffer;
     dstPI.fRowBytes = count * sizeof(SkPMColor);
 
     SkSrcPixelInfo srcPI;
-    srcPI.fColorType = kPMColor_SkColorType;
+    srcPI.fColorType = kN32_SkColorType;
     srcPI.fAlphaType = kPremul_SkAlphaType;
     srcPI.fPixels = ctable->lockColors();
     srcPI.fRowBytes = count * sizeof(SkPMColor);
 
     srcPI.convertPixelsTo(&dstPI, count, 1);
 
     ctable->unlockColors();
 
     // always skip a full 256 number of entries, even if we memcpy'd fewer
     dst += kGrColorTableSize;
@@ skipping 102 matching lines @@
                 return result;
             } else {
                 GrTexture* result = ctx->lockAndRefScratchTexture(desc,
                                                             GrContext::kExact_ScratchTexMatch);
                 result->writePixels(0, 0, bitmap->width(),
                                     bitmap->height(), desc.fConfig,
                                     storage.get());
                 return result;
             }
         } else {
-            origBitmap.copyTo(&tmpBitmap, kPMColor_SkColorType);
+            origBitmap.copyTo(&tmpBitmap, kN32_SkColorType);
             // now bitmap points to our temp, which has been promoted to 32bits
             bitmap = &tmpBitmap;
             desc.fConfig = SkBitmapConfig2GrPixelConfig(bitmap->config());
         }
     }
 
     SkAutoLockPixels alp(*bitmap);
     if (!bitmap->readyToDraw()) {
         return NULL;
     }
@@ skipping 136 matching lines @@
             ct = kBGRA_8888_SkColorType;
             break;
         default:
             return false;
     }
     if (ctOut) {
         *ctOut = ct;
     }
     return true;
 }