diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 06:09:27 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 06:09:27 +0000 |
| commit | 6fb51fa23bea704e4a768fa7247620bd7ee97051 (patch) | |
| tree | dc1ca7a9f5127567785e6b00981a309f1a17a866 /skia/ext/image_operations.cc | |
| parent | 8111565cc04c414624a7bf2ef57aa6d93d785b4a (diff) | |
| download | chromium_src-6fb51fa23bea704e4a768fa7247620bd7ee97051.zip chromium_src-6fb51fa23bea704e4a768fa7247620bd7ee97051.tar.gz chromium_src-6fb51fa23bea704e4a768fa7247620bd7ee97051.tar.bz2 | |
Revert 206227 "Make sure skia doesn't try to scale images with l..."
Speculative fix for DCHECK failure in ui_unittests on win debug bots.
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%281%29/builds/36957
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/19757
> Make sure skia doesn't try to scale images with less than 32 bits per pixel.
>
> BUG=247081
>
> Review URL: https://chromiumcodereview.appspot.com/16843004
TBR=hubbe@chromium.org
Review URL: https://codereview.chromium.org/16855019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/image_operations.cc')
| -rw-r--r-- | skia/ext/image_operations.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index f30a85d..b1cdade 100644 --- a/skia/ext/image_operations.cc +++ b/skia/ext/image_operations.cc @@ -496,8 +496,8 @@ SkBitmap ImageOperations::ResizeBasic(const SkBitmap& source, (method <= ImageOperations::RESIZE_LAST_ALGORITHM_METHOD)); SkAutoLockPixels locker(source); - if (!source.readyToDraw() || source.config() != SkBitmap::kARGB_8888_Config) - return SkBitmap(); + if (!source.readyToDraw()) + return SkBitmap(); ResizeFilter filter(method, source.width(), source.height(), dest_width, dest_height, dest_subset); |