Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/utils/SkBitmapHasher.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 "SkBitmap.h"
 #include "SkBitmapHasher.h"
 #include "SkEndian.h"
@@ skipping 39 matching lines @@
 }
 
 /*static*/ bool SkBitmapHasher::ComputeDigest(const SkBitmap& bitmap, uint64_t *result) {
     if (ComputeDigestInternal(bitmap, result)) {
         return true;
     }
 
     // Hmm, that didn't work. Maybe if we create a new
     // kARGB_8888_Config version of the bitmap it will work better?
     SkBitmap copyBitmap;
-    if (!bitmap.copyTo(&copyBitmap, kPMColor_SkColorType)) {
+    if (!bitmap.copyTo(&copyBitmap, kN32_SkColorType)) {
         return false;
     }
     return ComputeDigestInternal(copyBitmap, result);
 }