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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 6823081: Add Skia to CG adapter for plugins. (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
« webkit/plugins/npapi/webplugin_delegate_impl_mac.mm ('K') | « webkit/plugins/npapi/webplugin_delegate_impl_mac.mm ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
===================================================================
--- webkit/plugins/ppapi/ppapi_plugin_instance.h (revision 85477)
+++ webkit/plugins/ppapi/ppapi_plugin_instance.h (working copy)
@@ -287,7 +287,7 @@
bool DrawJPEGToPlatformDC(const SkBitmap& bitmap,
const gfx::Rect& printable_area,
WebKit::WebCanvas* canvas);
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) && !defined(USE_SKIA)
// Draws the given kARGB_8888_Config bitmap to the specified canvas starting
// at the specified destination rect.
void DrawSkBitmapToCanvas(const SkBitmap& bitmap, WebKit::WebCanvas* canvas,
« webkit/plugins/npapi/webplugin_delegate_impl_mac.mm ('K') | « webkit/plugins/npapi/webplugin_delegate_impl_mac.mm ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698