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

Unified Diff: content/renderer/fetchers/multi_resolution_image_resource_fetcher.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/image_resource_fetcher.cc ('k') | content/renderer/image_loading_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc
===================================================================
--- content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc (revision 208527)
+++ content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc (working copy)
@@ -6,10 +6,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "content/child/image_decoder.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/size.h"
-#include "webkit/glue/image_decoder.h"
using WebKit::WebFrame;
using WebKit::WebURLRequest;
@@ -46,7 +46,7 @@
http_status_code_ = response.httpStatusCode();
if (http_status_code_ == 200) {
// Request succeeded, try to convert it to an image.
- bitmaps = webkit_glue::ImageDecoder::DecodeAll(
+ bitmaps = ImageDecoder::DecodeAll(
reinterpret_cast<const unsigned char*>(data.data()), data.size());
}
} // else case:
« no previous file with comments | « content/renderer/fetchers/image_resource_fetcher.cc ('k') | content/renderer/image_loading_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698