| Index: ui/gfx/android/java_bitmap.cc
|
| diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc
|
| index a5b891a4af790f97e9702e688b9adf6163d9ea7d..7512b4222b1a103c29bcb65ddc0eb42932d4b860 100644
|
| --- a/ui/gfx/android/java_bitmap.cc
|
| +++ b/ui/gfx/android/java_bitmap.cc
|
| @@ -107,15 +107,12 @@ SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) {
|
| gfx::Size src_size = jbitmap.size();
|
|
|
| SkBitmap skbitmap;
|
| - skbitmap.setConfig(SkBitmap::kARGB_8888_Config,
|
| - src_size.width(),
|
| - src_size.height(),
|
| - jbitmap.stride());
|
| - if (!skbitmap.allocPixels()) {
|
| + if (!skbitmap.allocPixels(SkImageInfo::MakeN32Premul(src_size.width(),
|
| + src_size.height()),
|
| + jbitmap.stride())) {
|
| LOG(FATAL) << " Failed to allocate bitmap of size " << src_size.width()
|
| << "x" << src_size.height() << " stride=" << jbitmap.stride();
|
| }
|
| - SkAutoLockPixels dst_lock(skbitmap);
|
| const void* src_pixels = jbitmap.pixels();
|
| void* dst_pixels = skbitmap.getPixels();
|
| memcpy(dst_pixels, src_pixels, skbitmap.getSize());
|
|
|