stop using SkBitmap::Config

src/images/SkImageEncoder_argb.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageEncoder.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 53 matching lines @@
   for (int i = 0; i < width; ++i) {
       const uint32_t c = ctable[*src++];
       argb[0] = SkGetPackedA32(c);
       argb[1] = SkGetPackedR32(c);
       argb[2] = SkGetPackedG32(c);
       argb[3] = SkGetPackedB32(c);
       argb += 4;
   }
 }
 
-static ScanlineImporter ChooseImporter(const SkBitmap::Config& config) {
-    switch (config) {
-        case SkBitmap::kARGB_8888_Config:
+static ScanlineImporter ChooseImporter(SkColorType ct) {
+    switch (ct) {
+        case kN32_SkColorType:
             return ARGB_8888_To_ARGB;
-        case SkBitmap::kRGB_565_Config:
+        case kRGB_565_SkColorType:
             return RGB_565_To_ARGB;
-        case SkBitmap::kARGB_4444_Config:
+        case kARGB_4444_SkColorType:
             return ARGB_4444_To_ARGB;
-        case SkBitmap::kIndex8_Config:
+        case kIndex_8_SkColorType:
             return Index8_To_ARGB;
         default:
             return NULL;
     }
 }
 
 bool SkARGBImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) {
-    const SkBitmap::Config config = bitmap.config();
-    const ScanlineImporter scanline_import = ChooseImporter(config);
+    const ScanlineImporter scanline_import = ChooseImporter(bitmap.colorType());
     if (NULL == scanline_import) {
         return false;
     }
 
     SkAutoLockPixels alp(bitmap);
     const uint8_t* src = (uint8_t*)bitmap.getPixels();
     if (NULL == bitmap.getPixels()) {
         return false;
     }
 
     SkAutoLockColors ctLocker;
     const SkPMColor* colors = ctLocker.lockColors(bitmap);
 
     const int argbStride = bitmap.width() * 4;
     SkAutoTDeleteArray<uint8_t> ada(new uint8_t[argbStride]);
     uint8_t* argb = ada.get();
     for (int y = 0; y < bitmap.height(); ++y) {
         scanline_import(src + y * bitmap.rowBytes(), argb, bitmap.width(), colors);
         stream->write(argb, argbStride);
     }
 
     return true;
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 DEFINE_ENCODER_CREATOR(ARGBImageEncoder);
 ///////////////////////////////////////////////////////////////////////////////