summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 20:26:34 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 20:26:34 +0000
commit1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48 (patch)
tree5372127f368e3ec646395797d5fc8cd7439720eb /webkit/glue
parente9a3b0cfd6a280250cf7266e3f4d03e0fda624a8 (diff)
downloadchromium_src-1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48.zip
chromium_src-1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48.tar.gz
chromium_src-1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48.tar.bz2
mac: Clean up a few more uses of USE_SKIA
Likely also fixes a top-down-flipped bug with the in-process command buffer. BUG=110881 TBR=tony Review URL: https://codereview.chromium.org/12896006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webkit_glue.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index e8c4060..6572599 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -267,11 +267,7 @@ bool DecodeImage(const std::string& image_data, SkBitmap* image) {
if (web_image.isNull())
return false;
-#if defined(OS_MACOSX) && !defined(USE_SKIA)
- *image = gfx::CGImageToSkBitmap(web_image.getCGImageRef());
-#else
*image = web_image.getSkBitmap();
-#endif
return true;
}