SkBitmap::Config is deprecated, use SkColorType instead

ui/gfx/android/java_bitmap.cc

 // Copyright (c) 2012 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 "ui/gfx/android/java_bitmap.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
@@ skipping 40 matching lines @@
       return BITMAP_FORMAT_ARGB_8888;
     case SkBitmap::kRGB_565_Config:
       return BITMAP_FORMAT_RGB_565;
     case SkBitmap::kNo_Config:
     default:
       NOTREACHED();
       return BITMAP_FORMAT_NO_CONFIG;
   }
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaBitmap(int width,

[msw, 2014/07/08 01:11:29]

Doesn't this need to be updated like the declaration?

[reed1, 2014/07/08 13:01:57]

Done.

                                              int height,
                                              SkBitmap::Config bitmap_config) {
   DCHECK_GT(width, 0);
   DCHECK_GT(height, 0);
   int java_bitmap_config = SkBitmapConfigToBitmapFormat(bitmap_config);
   return Java_BitmapHelper_createBitmap(
       AttachCurrentThread(), width, height, java_bitmap_config);
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaBitmapFromAndroidResource(
     const char* name,
     gfx::Size size) {
   DCHECK(name);
   DCHECK(!size.IsEmpty());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jname(ConvertUTF8ToJavaString(env, name));
   return Java_BitmapHelper_decodeDrawableResource(
       env, jname.obj(), size.width(), size.height());
 }
 
 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
   DCHECK(skbitmap);
   DCHECK(!skbitmap->isNull());
   SkBitmap::Config bitmap_config = skbitmap->config();
   DCHECK((bitmap_config == SkBitmap::kRGB_565_Config) ||
          (bitmap_config == SkBitmap::kARGB_8888_Config));
   ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap(

[msw, 2014/07/08 01:11:29]

Doesn't this call need to be updated?

[reed1, 2014/07/08 13:01:57]

Done.

       skbitmap->width(), skbitmap->height(), bitmap_config);
   SkAutoLockPixels src_lock(*skbitmap);
   JavaBitmap dst_lock(jbitmap.obj());
   void* src_pixels = skbitmap->getPixels();
   void* dst_pixels = dst_lock.pixels();
   memcpy(dst_pixels, src_pixels, skbitmap->getSize());
 
   return jbitmap;
 }
 
@@ skipping 14 matching lines @@
     LOG(FATAL) << " Failed to allocate bitmap of size " << src_size.width()
                << "x" << src_size.height() << " stride=" << jbitmap.stride();
   }
   const void* src_pixels = jbitmap.pixels();
   void* dst_pixels = skbitmap.getPixels();
   memcpy(dst_pixels, src_pixels, skbitmap.getSize());
 
   return skbitmap;
 }
 
-SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config) {
+SkColorType ConvertToSkiaColorType(jobject bitmap_config) {
   int jbitmap_config = Java_BitmapHelper_getBitmapFormatForConfig(
       AttachCurrentThread(), bitmap_config);
   switch (jbitmap_config) {
     case BITMAP_FORMAT_ALPHA_8:
-      return SkBitmap::kA8_Config;
+      return kAlpha_8_SkColorType;
     case BITMAP_FORMAT_ARGB_4444:
-      return SkBitmap::kARGB_4444_Config;
+      return kARGB_4444_SkColorType;
     case BITMAP_FORMAT_ARGB_8888:
-      return SkBitmap::kARGB_8888_Config;
+      return kN32_SkColorType;
     case BITMAP_FORMAT_RGB_565:
-      return SkBitmap::kRGB_565_Config;
+      return kRGB_565_SkColorType;
     case BITMAP_FORMAT_NO_CONFIG:
     default:
-      return SkBitmap::kNo_Config;
+      return kUnknown_SkColorType;
   }
 }
 
 }  //  namespace gfx