| 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..2313711824810d617dd69c5d85e145429e1f0970 100644
|
| --- a/ui/gfx/android/java_bitmap.cc
|
| +++ b/ui/gfx/android/java_bitmap.cc
|
| @@ -68,6 +68,9 @@ static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource(
|
| }
|
|
|
| static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) {
|
| + if (jbitmap.is_null())
|
| + return SkBitmap();
|
| +
|
| JavaBitmap src_lock(jbitmap.obj());
|
| DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888);
|
|
|
|
|