Index: chrome/renderer/render_view.cc |
=================================================================== |
--- chrome/renderer/render_view.cc (revision 41111) |
+++ chrome/renderer/render_view.cc (working copy) |
@@ -82,6 +82,7 @@ |
#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" |
+#include "third_party/WebKit/WebKit/chromium/public/WebImage.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h" |
@@ -154,6 +155,7 @@ |
using WebKit::WebFormElement; |
using WebKit::WebFrame; |
using WebKit::WebHistoryItem; |
+using WebKit::WebImage; |
using WebKit::WebInputElement; |
using WebKit::WebMediaPlayer; |
using WebKit::WebMediaPlayerAction; |
@@ -1888,11 +1890,27 @@ |
hint)); |
} |
-void RenderView::startDragging(const WebPoint& from, const WebDragData& data, |
- WebDragOperationsMask allowed_ops) { |
+void RenderView::startDragging(const WebKit::WebDragData& data, |
+ WebKit::WebDragOperationsMask mask) { |
+ startDragging(data, mask, WebImage(), WebPoint()); |
+} |
+ |
+void RenderView::startDragging(const WebDragData& data, |
+ WebDragOperationsMask mask, |
+ const WebImage& image, |
+ const WebPoint& imageOffset) { |
+#if WEBKIT_USING_SKIA |
+ SkBitmap bitmap(image.getSkBitmap()); |
+#elif WEBKIT_USING_CG |
+ // Needs implementing: http://crbug.com/11457 |
+ SkBitmap bitmap(); |
+#endif |
+ |
Send(new ViewHostMsg_StartDragging(routing_id_, |
WebDropData(data), |
- allowed_ops)); |
+ mask, |
+ bitmap, |
+ imageOffset)); |
} |
bool RenderView::acceptsLoadDrops() { |