diff options
| author | reveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 20:11:58 +0000 |
|---|---|---|
| committer | reveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 20:11:58 +0000 |
| commit | d237c93cd01d1ff6fd4cf00ec7d2b85d5577bb61 (patch) | |
| tree | 88c927602b5e5a1063b538d2565b6c008ad9a442 /ui | |
| parent | 18b758a483a7554664bc77d4f90f1ecdd7c1dede (diff) | |
| download | chromium_src-d237c93cd01d1ff6fd4cf00ec7d2b85d5577bb61.zip chromium_src-d237c93cd01d1ff6fd4cf00ec7d2b85d5577bb61.tar.gz chromium_src-d237c93cd01d1ff6fd4cf00ec7d2b85d5577bb61.tar.bz2 | |
Check return value of SkBitmap::readyToDraw before calling SkBitmap::getAddr32.
BUG=chromium:96032
TEST=manual
Review URL: http://codereview.chromium.org/7796006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/image/image_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc index a9f6005..a73b1f1 100644 --- a/ui/gfx/image/image_util.cc +++ b/ui/gfx/image/image_util.cc @@ -30,6 +30,10 @@ bool JPEGEncodedDataFromImage(const Image& image, std::vector<unsigned char>* dst) { const SkBitmap& bitmap = image; SkAutoLockPixels bitmap_lock(bitmap); + + if (!bitmap.readyToDraw()) + return false; + // Use 90 quality (out of 100) which is pretty high, because // we're very sensitive to artifacts for these small sized, // highly detailed images. |