summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_view_impl.cc8
-rw-r--r--content/renderer/webplugin_delegate_proxy.cc4
2 files changed, 1 insertions, 11 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6a9d750..e852574 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1954,16 +1954,10 @@ void RenderViewImpl::startDragging(const WebDragData& data,
WebDragOperationsMask mask,
const WebImage& image,
const WebPoint& imageOffset) {
-#if WEBKIT_USING_SKIA
- SkBitmap bitmap(image.getSkBitmap());
-#elif WEBKIT_USING_CG
- SkBitmap bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef());
-#endif
-
Send(new DragHostMsg_StartDragging(routing_id_,
WebDropData(data),
mask,
- bitmap,
+ image.getSkBitmap(),
imageOffset));
}
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index d319dbd..edc8550 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -703,7 +703,6 @@ void WebPluginDelegateProxy::Paint(WebKit::WebCanvas* canvas,
return;
// We're using the native OS APIs from here on out.
-#if WEBKIT_USING_SKIA
if (!skia::SupportsPlatformPaint(canvas)) {
// TODO(alokp): Implement this path.
// This block will only get hit with --enable-accelerated-drawing flag.
@@ -716,9 +715,6 @@ void WebPluginDelegateProxy::Paint(WebKit::WebCanvas* canvas,
skia::ScopedPlatformPaint scoped_platform_paint(canvas);
gfx::NativeDrawingContext context =
scoped_platform_paint.GetPlatformSurface();
-#elif WEBKIT_USING_CG
- gfx::NativeDrawingContext context = canvas;
-#endif
gfx::Rect offset_rect = rect;
offset_rect.Offset(-plugin_rect_.x(), -plugin_rect_.y());