| Index: ui/gfx/image/image_util.cc
|
| diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
|
| index 16387149d142c76d4d91126c314a526b8c3c8249..12c597e0ce35552e1a2aa0eecea90045012aa3ca 100644
|
| --- a/ui/gfx/image/image_util.cc
|
| +++ b/ui/gfx/image/image_util.cc
|
| @@ -65,12 +65,11 @@ bool JPEG1xEncodedDataFromSkiaRepresentation(const Image& image,
|
| if (!bitmap.readyToDraw())
|
| return false;
|
|
|
| - return gfx::JPEGCodec::Encode(
|
| - reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
|
| - gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(),
|
| - bitmap.height(),
|
| - static_cast<int>(bitmap.rowBytes()), quality,
|
| - dst);
|
| + SkPixmap pixmap;
|
| + bool success = bitmap.peekPixels(&pixmap);
|
| + DCHECK(success);
|
| +
|
| + return gfx::JPEGCodec::Encode(pixmap, quality, dst);
|
| }
|
| #endif // !defined(OS_IOS)
|
|
|
|
|