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

Unified Diff: chrome/renderer/render_view.cc

Issue 668125: Basic DragImage implementation.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 | « chrome/renderer/render_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « chrome/renderer/render_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698