| 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..befb09b7361b1cd93e3ada08b18d7a1ee556c3b7 100644
|
| --- a/ui/gfx/android/java_bitmap.h
|
| +++ b/ui/gfx/android/java_bitmap.h
|
| @@ -51,11 +51,11 @@ class GFX_EXPORT JavaBitmap {
|
| };
|
|
|
| // Allocates a Java-backed bitmap (android.graphics.Bitmap) with the given
|
| -// (non-empty!) size and configuration.
|
| +// (non-empty!) size and color type.
|
| GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap(
|
| int width,
|
| int height,
|
| - SkBitmap::Config bitmap_config);
|
| + SkColorType color_type);
|
|
|
| // Loads a Java-backed bitmap (android.graphics.Bitmap) from the provided
|
| // drawable resource identifier (e.g., android:drawable/overscroll_glow). If the
|
| @@ -74,8 +74,8 @@ GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(
|
| // Note: |jbitmap| is assumed to be non-null, non-empty and of format RGBA_8888.
|
| 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);
|
| +// Returns a Skia color type value for the requested input java Bitmap.Config.
|
| +GFX_EXPORT SkColorType ConvertToSkiaColorType(jobject jbitmap_config);
|
|
|
| } // namespace gfx
|
|
|
|
|