SkBitmap::Config is deprecated, use SkColorType

Source/platform/graphics/LoggingCanvas.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 577 matching lines @@
         pathPointItem->setArray("points", arrayForSkPoints(verbParams.pointCount, points + verbParams.pointOffset));
         if (SkPath::kConic_Verb == verb)
             pathPointItem->setNumber("conicWeight", iter.conicWeight());
         pathPointsArray->pushObject(pathPointItem);
     }
     pathItem->setArray("pathPoints", pathPointsArray);
     pathItem->setObject("bounds", objectForSkRect(path.getBounds()));
     return pathItem.release();
 }
 
-String LoggingCanvas::configName(SkBitmap::Config config)
+String LoggingCanvas::colorTypeName(SkColorType colorType)
 {
-    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";
+    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 "?";
     };
 }
 
 PassRefPtr<JSONObject> LoggingCanvas::objectForBitmapData(const SkBitmap& bitmap)
 {
     RefPtr<JSONObject> dataItem = JSONObject::create();
     Vector<unsigned char> output;
     WebCore::PNGImageEncoder::encode(bitmap, &output);
     dataItem->setString("base64", WTF::base64Encode(reinterpret_cast<char*>(output.data()), output.size()));
     dataItem->setString("mimeType", "image/png");
     return dataItem.release();
 }
 
 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());
     bitmapItem->setNumber("genID", bitmap.getGenerationID());
     bitmapItem->setObject("data", objectForBitmapData(bitmap));
     return bitmapItem.release();
 }
 
 PassRefPtr<JSONObject> LoggingCanvas::objectForSkShader(const SkShader& shader)
 {
@@ skipping 240 matching lines @@
         SkUnichar* textData = dataVector.data();
         paint.glyphsToUnichars(static_cast<const uint16_t*>(text), byteLength / 2, textData);
         return WTF::UTF32LittleEndianEncoding().decode(reinterpret_cast<const char*>(textData), byteLength * 2);
     }
     default:
         ASSERT_NOT_REACHED();
         return "?";
     }
 }
 }