Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkSpriteBlitter_RGB16.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkSpriteBlitter.h"
@@ skipping 307 matching lines @@
         return NULL;
     }
     if (paint.getColorFilter() != NULL) { // may add cases for this
         return NULL;
     }
 
     SkSpriteBlitter* blitter = NULL;
     unsigned alpha = paint.getAlpha();
 
     switch (source.colorType()) {
-        case kPMColor_SkColorType: {
+        case kN32_SkColorType: {
             blitter = allocator->createT<Sprite_D16_S32_BlitRowProc>(source);
             break;
         }
         case kARGB_4444_SkColorType:
             if (255 == alpha) {
                 blitter = allocator->createT<Sprite_D16_S4444_Opaque>(source);
             } else {
                 blitter = allocator->createT<Sprite_D16_S4444_Blend>(source, alpha >> 4);
             }
             break;
@@ skipping 21 matching lines @@
                 } else {
                     blitter = allocator->createT<Sprite_D16_SIndex8A_Blend>(source, alpha);
                 }
             }
             break;
         default:
             break;
     }
     return blitter;
 }