stop using SkBitmap::Config

tools/skpdiff/SkCLImageDiffer.cpp

Index: tools/skpdiff/SkCLImageDiffer.cpp
diff --git a/tools/skpdiff/SkCLImageDiffer.cpp b/tools/skpdiff/SkCLImageDiffer.cpp
index b99ef40d700f9b361462460613f883a3ee47d301..1c5d5c56ea3993c65047d657ad56e45995f85f71 100644
--- a/tools/skpdiff/SkCLImageDiffer.cpp
+++ b/tools/skpdiff/SkCLImageDiffer.cpp
@@ -87,16 +87,16 @@ bool SkCLImageDiffer::loadKernelSource(const char source[], const char name[], c
 bool SkCLImageDiffer::makeImage2D(SkBitmap* bitmap, cl_mem* image) const {
     cl_int imageErr;
     cl_image_format bitmapFormat;
-    switch (bitmap->config()) {
-        case SkBitmap::kA8_Config:
+    switch (bitmap->colorType()) {
+        case kAlpha_8_SkColorType:
             bitmapFormat.image_channel_order = CL_A;
             bitmapFormat.image_channel_data_type = CL_UNSIGNED_INT8;
             break;
-        case SkBitmap::kRGB_565_Config:
+        case kRGB_565_SkColorType:
             bitmapFormat.image_channel_order = CL_RGB;
             bitmapFormat.image_channel_data_type = CL_UNORM_SHORT_565;
             break;
-        case SkBitmap::kARGB_8888_Config:
+        case kN32_SkColorType:
             bitmapFormat.image_channel_order = CL_RGBA;
             bitmapFormat.image_channel_data_type = CL_UNSIGNED_INT8;
             break;