SkBitmap::Config is deprecated, use SkColorType instead

ui/gfx/android/java_bitmap.h

Index: ui/gfx/android/java_bitmap.h
diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h
index 44a17cade7442f4f8dc9550717c6268a291d2611..940dafa50a6823aecbc7c960daa50028bfcc1fb2 100644
--- a/ui/gfx/android/java_bitmap.h
+++ b/ui/gfx/android/java_bitmap.h
@@ -55,7 +55,7 @@ class GFX_EXPORT JavaBitmap {
 GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap(
     int width,
     int height,
-    SkBitmap::Config bitmap_config);
+    SkColorType color_type);

[msw, 2014/07/07 19:47:51]

Why is there no corresponding change to the signatures and implementations of
these two functions in ui/gfx/android/java_bitmap.cc?

[reed1, 2014/07/07 19:51:46]

Good catch. I'm updating those files now (didn't compile).

 
 // Loads a Java-backed bitmap (android.graphics.Bitmap) from the provided
 // drawable resource identifier (e.g., android:drawable/overscroll_glow). If the
@@ -75,7 +75,7 @@ GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(
 GFX_EXPORT SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap);
 
 // Returns a Skia config value for the requested input java Bitmap.Config.
-GFX_EXPORT SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config);
+GFX_EXPORT SkColorType ConvertToSkiaColorType(jobject color_type);
 
 }  // namespace gfx