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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/webkit_glue.cc

Issue 6840057: Map webkit glue when Mac build uses Skia. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 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 | « webkit/glue/webcursor_mac.mm ('k') | webkit/glue/webthemeengine_impl_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.cc
===================================================================
--- webkit/glue/webkit_glue.cc (revision 85477)
+++ webkit/glue/webkit_glue.cc (working copy)
@@ -270,7 +270,7 @@
if (web_image.isNull())
return false;
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(USE_SKIA)
*image = gfx::CGImageToSkBitmap(web_image.getCGImageRef());
#else
*image = web_image.getSkBitmap();
« no previous file with comments | « webkit/glue/webcursor_mac.mm ('k') | webkit/glue/webthemeengine_impl_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698