Index: ui/gfx/android/java_bitmap.cc |
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc |
index a19a000fb71844cc259dcd33e5557d3b2303e59a..5855b021b042f932c96f7f80604cdf8bf39a7514 100644 |
--- a/ui/gfx/android/java_bitmap.cc |
+++ b/ui/gfx/android/java_bitmap.cc |
@@ -67,8 +67,8 @@ static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource( |
return ui::Java_BitmapHelper_decodeDrawableResource(env, jname.obj()); |
} |
-static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) { |
- JavaBitmap src_lock(jbitmap.obj()); |
+SkBitmap CreateSkBitmapFromJavaBitmap(jobject jbitmap) { |
+ JavaBitmap src_lock(jbitmap); |
DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888); |
gfx::Size src_size = src_lock.size(); |
@@ -88,7 +88,8 @@ static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) { |
} |
SkBitmap CreateSkBitmapFromResource(const char* name) { |
- return ConvertToSkBitmap(CreateJavaBitmapFromResource(name)); |
+ ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmapFromResource(name); |
+ return CreateSkBitmapFromJavaBitmap(jbitmap.obj()); |
} |
} // namespace gfx |