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 |