use colortype instead of config

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 306 matching lines @@
     if (paint.getXfermode() != NULL) { // may add cases for this
         return NULL;
     }
     if (paint.getColorFilter() != NULL) { // may add cases for this
         return NULL;
     }
 
     SkSpriteBlitter* blitter = NULL;
     unsigned alpha = paint.getAlpha();
 
-    switch (source.config()) {
-        case SkBitmap::kARGB_8888_Config:
+    switch (source.colorType()) {
+        case kPMColor_SkColorType:
             SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S32_BlitRowProc,
                                   storage, storageSize, (source));
             break;
-        case SkBitmap::kARGB_4444_Config:
+        case kARGB_4444_SkColorType:
             if (255 == alpha) {
                 SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S4444_Opaque,
                                       storage, storageSize, (source));
             } else {
                 SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S4444_Blend,
                                     storage, storageSize, (source, alpha >> 4));
             }
             break;
-        case SkBitmap::kRGB_565_Config:
+        case kRGB_565_SkColorType:
             if (255 == alpha) {
                 SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S16_Opaque,
                                       storage, storageSize, (source));
             } else {
                 SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_S16_Blend,
                                       storage, storageSize, (source, alpha));
             }
             break;
-        case SkBitmap::kIndex8_Config:
+        case kIndex_8_SkColorType:
             if (paint.isDither()) {
                 // we don't support dither yet in these special cases
                 break;
             }
             if (source.isOpaque()) {
                 if (255 == alpha) {
                     SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_SIndex8_Opaque,
                                           storage, storageSize, (source));
                 } else {
                     SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_SIndex8_Blend,
                                          storage, storageSize, (source, alpha));
                 }
             } else {
                 if (255 == alpha) {
                     SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_SIndex8A_Opaque,
                                           storage, storageSize, (source));
                 } else {
                     SK_PLACEMENT_NEW_ARGS(blitter, Sprite_D16_SIndex8A_Blend,
                                          storage, storageSize, (source, alpha));
                 }
             }
             break;
         default:
             break;
     }
     return blitter;
 }