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

Unified Diff: content/renderer/image_loading_helper.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 | « content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc ('k') | webkit/glue/image_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/image_loading_helper.cc
===================================================================
--- content/renderer/image_loading_helper.cc (revision 208527)
+++ content/renderer/image_loading_helper.cc (working copy)
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/message_loop.h"
+#include "content/child/image_decoder.h"
#include "content/common/image_messages.h"
#include "content/public/common/url_constants.h"
#include "content/public/renderer/render_view.h"
@@ -19,7 +20,6 @@
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skbitmap_operations.h"
-#include "webkit/glue/image_decoder.h"
#include "webkit/glue/webkit_glue.h"
using WebKit::WebFrame;
@@ -170,8 +170,7 @@
std::string mime_type, char_set, data;
if (net::DataURL::Parse(url, &mime_type, &char_set, &data) && !data.empty()) {
// Decode the image using WebKit's image decoder.
- webkit_glue::ImageDecoder decoder(
- gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize));
+ ImageDecoder decoder(gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize));
const unsigned char* src_data =
reinterpret_cast<const unsigned char*>(&data[0]);
« no previous file with comments | « content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc ('k') | webkit/glue/image_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698