SkBitmap::Config is deprecated, use SkColorType

Source/platform/graphics/LoggingCanvas.cpp

Index: Source/platform/graphics/LoggingCanvas.cpp
diff --git a/Source/platform/graphics/LoggingCanvas.cpp b/Source/platform/graphics/LoggingCanvas.cpp
index 511d4b58c0fa4649ca6c7c7ee0cbd044d81ee655..aa1aa3d7a3d8cd612c9c147315b156ccc7c59897 100644
--- a/Source/platform/graphics/LoggingCanvas.cpp
+++ b/Source/platform/graphics/LoggingCanvas.cpp
@@ -595,15 +595,15 @@ PassRefPtr<JSONObject> LoggingCanvas::objectForSkPath(const SkPath& path)
     return pathItem.release();
 }
 
-String LoggingCanvas::configName(SkBitmap::Config config)
-{
-    switch (config) {
-    case SkBitmap::kNo_Config: return "None";
-    case SkBitmap::kA8_Config: return "A8";
-    case SkBitmap::kIndex8_Config: return "Index8";
-    case SkBitmap::kRGB_565_Config: return "RGB565";
-    case SkBitmap::kARGB_4444_Config: return "ARGB4444";
-    case SkBitmap::kARGB_8888_Config: return "ARGB8888";
+String LoggingCanvas::colorTypeName(SkColorType colorType)
+{
+    switch (colorType) {
+    case kUnknown_SkColorType: return "None";
+    case kAlpha_8_SkColorType: return "A8";
+    case kIndex_8_SkColorType: return "Index8";
+    case kRGB_565_SkColorType: return "RGB565";
+    case kARGB_4444_SkColorType: return "ARGB4444";
+    case kN32_SkColorType: return "ARGB8888";
     default:
         ASSERT_NOT_REACHED();
         return "?";
@@ -625,7 +625,7 @@ PassRefPtr<JSONObject> LoggingCanvas::objectForSkBitmap(const SkBitmap& bitmap)
     RefPtr<JSONObject> bitmapItem = JSONObject::create();
     bitmapItem->setNumber("width", bitmap.width());
     bitmapItem->setNumber("height", bitmap.height());
-    bitmapItem->setString("config", configName(bitmap.config()));
+    bitmapItem->setString("colorType", colorTypeName(bitmap.colorType()));

[f(malita), 2014/07/09 13:56:51]

Not sure whether it's safe to change the property name. malch: are there any
external dependencies?

     bitmapItem->setBoolean("opaque", bitmap.isOpaque());
     bitmapItem->setBoolean("immutable", bitmap.isImmutable());
     bitmapItem->setBoolean("volatile", bitmap.isVolatile());