diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:11:02 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:11:02 +0000 |
| commit | 89a9df63bf06ccb2449e748b32e0062b78699042 (patch) | |
| tree | 59f10ff513fd2ccb8676b20ec2ea0befeecd848f | |
| parent | ec0aeea8ecd99a4b81aa289def6d0337da77e885 (diff) | |
| download | chromium_src-89a9df63bf06ccb2449e748b32e0062b78699042.zip chromium_src-89a9df63bf06ccb2449e748b32e0062b78699042.tar.gz chromium_src-89a9df63bf06ccb2449e748b32e0062b78699042.tar.bz2 | |
Use the ui/gfx png decoder for extension icon loading
This data is always a PNG encoded by the ui/gfx encoder so the ui/gfx png decoder
can always handle it. This removes a dependency on the WebKit image decoder from
the browser process.
R=jam
BUG=237267
Review URL: https://chromiumcodereview.appspot.com/18704009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211534 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/extensions/extension_icon_source.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 2af46db..5cd6ed6 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -24,7 +24,6 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" -#include "content/public/child/image_decoder_utils.h" #include "extensions/common/extension_resource.h" #include "grit/component_extension_resources_map.h" #include "grit/theme_resources.h" @@ -53,7 +52,8 @@ SkBitmap DesaturateImage(const SkBitmap* image) { SkBitmap* ToBitmap(const unsigned char* data, size_t size) { SkBitmap* decoded = new SkBitmap(); - *decoded = content::DecodeImage(data, gfx::Size(), size); + bool success = gfx::PNGCodec::Decode(data, size, decoded); + DCHECK(success); return decoded; } |