Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Unified Diff: chrome/browser/icon_loader_linux.cc

Issue 17704002: Move image_decoder.cc/.h from webkit\glue to content\child. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/favicon/favicon_util.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/icon_loader_linux.cc
===================================================================
--- chrome/browser/icon_loader_linux.cc (revision 208527)
+++ chrome/browser/icon_loader_linux.cc (working copy)
@@ -11,9 +11,10 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/nix/mime_util_xdg.h"
+#include "content/public/child/image_decoder_utils.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image_skia.h"
-#include "webkit/glue/image_decoder.h"
+#include "ui/gfx/size.h"
using std::string;
@@ -50,10 +51,10 @@
string icon_data;
file_util::ReadFileToString(filename, &icon_data);
- webkit_glue::ImageDecoder decoder;
SkBitmap bitmap;
- bitmap = decoder.Decode(
+ bitmap = content::DecodeImage(
reinterpret_cast<const unsigned char*>(icon_data.data()),
+ gfx::Size(),
icon_data.length());
if (!bitmap.empty()) {
DCHECK_EQ(size_pixels, bitmap.width());
« no previous file with comments | « chrome/browser/favicon/favicon_util.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698