Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkSpriteBlitter_ARGB32.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"
 #include "SkBlitRow.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class Sprite_D32_S32 : public SkSpriteBlitter {
 public:
     Sprite_D32_S32(const SkBitmap& src, U8CPU alpha)  : INHERITED(src) {
-        SkASSERT(src.colorType() == kN32_SkColorType);
+        SkASSERT(src.colorType() == kPMColor_SkColorType);
 
         unsigned flags32 = 0;
         if (255 != alpha) {
             flags32 |= SkBlitRow::kGlobalAlpha_Flag32;
         }
         if (!src.isOpaque()) {
             flags32 |= SkBlitRow::kSrcPixelAlpha_Flag32;
         }
 
         fProc32 = SkBlitRow::Factory32(flags32);
@@ skipping 248 matching lines @@
                 return NULL;    // we only have opaque sprites
             }
             if (xfermode || filter) {
                 blitter = allocator->createT<Sprite_D32_S4444_XferFilter>(source, paint);
             } else if (source.isOpaque()) {
                 blitter = allocator->createT<Sprite_D32_S4444_Opaque>(source);
             } else {
                 blitter = allocator->createT<Sprite_D32_S4444>(source);
             }
             break;
-        case kN32_SkColorType:
+        case kPMColor_SkColorType:
             if (xfermode || filter) {
                 if (255 == alpha) {
                     // this can handle xfermode or filter, but not alpha
                     blitter = allocator->createT<Sprite_D32_S32A_XferFilter>(source, paint);
                 }
             } else {
                 // this can handle alpha, but not xfermode or filter
                 blitter = allocator->createT<Sprite_D32_S32>(source, alpha);
             }
             break;
         default:
             break;
     }
     return blitter;
 }