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

Unified Diff: webkit/glue/webclipboard_impl.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 | « webkit/glue/image_decoder.cc ('k') | webkit/glue/webcursor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webclipboard_impl.cc
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 12634ead2d57450da903022cb13da4448d2c8ad4..b782cd2d9fa7eceeb90aa77446f0a1187c981b3d 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -24,10 +24,6 @@
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/webkit_glue.h"
-#if WEBKIT_USING_CG
-#include "skia/ext/skia_utils_mac.h"
-#endif
-
using WebKit::WebClipboard;
using WebKit::WebData;
using WebKit::WebDragData;
@@ -214,11 +210,7 @@ void WebClipboardImpl::writeImage(
ScopedClipboardWriterGlue scw(client_);
if (!image.isNull()) {
-#if WEBKIT_USING_SKIA
const SkBitmap& bitmap = image.getSkBitmap();
-#elif WEBKIT_USING_CG
- const SkBitmap& bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef());
-#endif
SkAutoLockPixels locked(bitmap);
scw.WriteBitmapFromPixels(bitmap.getPixels(), image.size());
}
« no previous file with comments | « webkit/glue/image_decoder.cc ('k') | webkit/glue/webcursor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698