SkBitmap::Config is no more, use SkColorType

chrome/browser/ui/app_list/fast_show_pickler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/fast_show_pickler.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
@@ skipping 32 matching lines @@
       *out = kARGB_4444_SkColorType;
       break;
     case ARGB_8888:
       *out = kN32_SkColorType;
       break;
     default: return false;
   }
   return true;
 }
 
-bool ConfigToFormat(SkBitmap::Config config, ImageFormat* out) {
-  switch (config) {
-    case SkBitmap::kNo_Config:
+bool ColorTypeToFormat(SkColorType colorType, ImageFormat* out) {
+  switch (colorType) {
+    case kUnknown_SkColorType:
       *out = NONE;
       break;
-    case SkBitmap::kA8_Config:
+    case kAlpha_8_SkColorType:
       *out = A8;
       break;
-    case SkBitmap::kIndex8_Config:
+    case kIndex_8_SkColorType:
       *out = INDEX_8;
       break;
-    case SkBitmap::kRGB_565_Config:
+    case kRGB_565_SkColorType:
       *out = RGB_565;
       break;
-    case SkBitmap::kARGB_4444_Config:
+    case kARGB_4444_SkColorType:
       *out = ARGB_4444;
       break;
-    case SkBitmap::kARGB_8888_Config:
+    case kN32_SkColorType:
       *out = ARGB_8888;
       break;
     default: return false;
   }
   return true;
 }
 
 bool PickleImage(Pickle* pickle, const gfx::ImageSkia& image) {
   std::vector<gfx::ImageSkiaRep> reps(image.image_reps());
   pickle->WriteInt(static_cast<int>(reps.size()));
   for (std::vector<gfx::ImageSkiaRep>::const_iterator it = reps.begin();
        it != reps.end(); ++it) {
     pickle->WriteFloat(it->scale());
     pickle->WriteInt(it->pixel_width());
     pickle->WriteInt(it->pixel_height());
     ImageFormat format = NONE;
-    if (!ConfigToFormat(it->sk_bitmap().config(), &format))
+    if (!ColorTypeToFormat(it->sk_bitmap().colorType(), &format))
       return false;
     pickle->WriteInt(static_cast<int>(format));
     int size = static_cast<int>(it->sk_bitmap().getSafeSize());
     pickle->WriteInt(size);
     SkBitmap bitmap = it->sk_bitmap();
     SkAutoLockPixels lock(bitmap);
     pickle->WriteBytes(bitmap.getPixels(), size);
   }
   return true;
 }
@@ skipping 138 matching lines @@
   for (int i = 0; i < app_count; ++i) {
     scoped_ptr<AppListItem> item(UnpickleAppListItem(&it).Pass());
     if (!item)
       return scoped_ptr<AppListModel>();
     std::string folder_id = item->folder_id();
     model->AddItemToFolder(item.Pass(), folder_id);
   }
 
   return model.Pass();
 }