Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkBlitter.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 "SkBlitter.h"
@@ skipping 905 matching lines @@
                 blitter = allocator->createT<SkA8_Shader_Blitter>(device, *paint);
             } else {
                 blitter = allocator->createT<SkA8_Blitter>(device, *paint);
             }
             break;
 
         case kRGB_565_SkColorType:
             blitter = SkBlitter_ChooseD565(device, *paint, allocator);
             break;
 
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             if (shader) {
                 blitter = allocator->createT<SkARGB32_Shader_Blitter>(device, *paint);
             } else if (paint->getColor() == SK_ColorBLACK) {
                 blitter = allocator->createT<SkARGB32_Black_Blitter>(device, *paint);
             } else if (paint->getAlpha() == 0xFF) {
                 blitter = allocator->createT<SkARGB32_Opaque_Blitter>(device, *paint);
             } else {
                 blitter = allocator->createT<SkARGB32_Blitter>(device, *paint);
             }
             break;
@@ skipping 27 matching lines @@
 
     fShader->ref();
     fShaderFlags = fShader->getFlags();
 }
 
 SkShaderBlitter::~SkShaderBlitter() {
     SkASSERT(fShader->setContextHasBeenCalled());
     fShader->endContext();
     fShader->unref();
 }