Index: ui/gfx/android/java_bitmap.h |
diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h |
index 34cd26af63d5e1f7e0d7813c14007c73446e2204..befb09b7361b1cd93e3ada08b18d7a1ee556c3b7 100644 |
--- a/ui/gfx/android/java_bitmap.h |
+++ b/ui/gfx/android/java_bitmap.h |
@@ -57,12 +57,12 @@ |
int height, |
SkColorType color_type); |
-// Loads an SkBitmap from the provided drawable resource identifier (e.g., |
-// android:drawable/overscroll_glow). If the resource loads successfully, it |
-// will be integrally scaled down, preserving aspect ratio, to a size no smaller |
-// than |size|. Otherwise, an empty bitmap is returned. |
-GFX_EXPORT SkBitmap |
- CreateSkBitmapFromAndroidResource(const char* name, gfx::Size size); |
+// Loads a Java-backed bitmap (android.graphics.Bitmap) from the provided |
+// drawable resource identifier (e.g., android:drawable/overscroll_glow). If the |
+// resource loads successfully, it will be integrally scaled down, preserving |
+// aspect ratio, to a size no smaller than |size|. Otherwise, null is returned. |
+GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> |
+ CreateJavaBitmapFromAndroidResource(const char* name, gfx::Size size); |
// Converts |skbitmap| to a Java-backed bitmap (android.graphics.Bitmap). |
// Note: |skbitmap| is assumed to be non-null, non-empty and one of RGBA_8888 or |