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

Unified Diff: webkit/glue/image_decoder.cc

Issue 10392018: remove WEBKIT_USING_CG (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « ppapi/shared_impl/private/ppb_font_shared.cc ('k') | webkit/glue/webclipboard_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/image_decoder.cc
diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc
index f17d2c1ffaf94b38deb78c44ad0d86dc5fff26db..0c0b68f8766be0a60c2694c878ff3a18259a4b54 100644
--- a/webkit/glue/image_decoder.cc
+++ b/webkit/glue/image_decoder.cc
@@ -9,10 +9,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#if WEBKIT_USING_CG
-#include "skia/ext/skia_utils_mac.h"
-#endif
-
using WebKit::WebData;
using WebKit::WebImage;
@@ -31,11 +27,7 @@ ImageDecoder::~ImageDecoder() {
SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) const {
const WebImage& image = WebImage::fromData(
WebData(reinterpret_cast<const char*>(data), size), desired_icon_size_);
-#if WEBKIT_USING_SKIA
return image.getSkBitmap();
-#elif WEBKIT_USING_CG
- return gfx::CGImageToSkBitmap(image.getCGImageRef());
-#endif
}
} // namespace webkit_glue
« no previous file with comments | « ppapi/shared_impl/private/ppb_font_shared.cc ('k') | webkit/glue/webclipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698