diff options
| author | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 17:29:25 +0000 |
|---|---|---|
| committer | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 17:29:25 +0000 |
| commit | 1d9f4137eff50f1305e288767bb770151526552d (patch) | |
| tree | 4ae1750d34778e7b0ae23dfe315118cf124c3715 /chrome/common/render_messages_internal.h | |
| parent | c7f475ed4a9fd8f198468df696c55e1c75d65526 (diff) | |
| download | chromium_src-1d9f4137eff50f1305e288767bb770151526552d.zip chromium_src-1d9f4137eff50f1305e288767bb770151526552d.tar.gz chromium_src-1d9f4137eff50f1305e288767bb770151526552d.tar.bz2 | |
Plumb the DragOperation through all the layers between the platform Drag-n-drop code and WebCore.
This allows the HTML5 DataTransfer effectAllowed and dropEffect properties to be set correctly in JS handlers, as per the HTML5 spec.
(The drag-dropeffect test isn't in WebKit yet -- it's part of a separate WebKit patch that's been in review for weeks.)
R=darin,pink
BUG=http://code.google.com/p/chromium/issues/detail?id=14654, http://code.google.com/p/chromium/issues/detail?id=20985
TEST=LayoutTests/fast/events/drag-dropeffect.html, LayoutTests/editing/pasteboard/files-during-page-drags.html
Review URL: http://codereview.chromium.org/174364
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages_internal.h')
| -rw-r--r-- | chrome/common/render_messages_internal.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 43b2b9c..9e9ac815 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -331,13 +331,15 @@ IPC_BEGIN_MESSAGES(View) webkit_glue::PasswordFormDomManager::FillData) // D&d drop target messages. - IPC_MESSAGE_ROUTED3(ViewMsg_DragTargetDragEnter, + IPC_MESSAGE_ROUTED4(ViewMsg_DragTargetDragEnter, WebDropData /* drop_data */, gfx::Point /* client_pt */, - gfx::Point /* screen_pt */) - IPC_MESSAGE_ROUTED2(ViewMsg_DragTargetDragOver, + gfx::Point /* screen_pt */, + WebKit::WebDragOperationsMask /* ops_allowed */) + IPC_MESSAGE_ROUTED3(ViewMsg_DragTargetDragOver, gfx::Point /* client_pt */, - gfx::Point /* screen_pt */) + gfx::Point /* screen_pt */, + WebKit::WebDragOperationsMask /* ops_allowed */) IPC_MESSAGE_ROUTED0(ViewMsg_DragTargetDragLeave) IPC_MESSAGE_ROUTED2(ViewMsg_DragTargetDrop, gfx::Point /* client_pt */, @@ -351,7 +353,7 @@ IPC_BEGIN_MESSAGES(View) gfx::Point /* client_pt */, gfx::Point /* screen_pt */, bool /* ended */, - bool /* cancelled */) + WebKit::WebDragOperation /* drag_operation */) // Notifies the renderer that the system DoDragDrop call has ended. IPC_MESSAGE_ROUTED0(ViewMsg_DragSourceSystemDragEnded) @@ -1104,13 +1106,14 @@ IPC_BEGIN_MESSAGES(ViewHost) // WebDropData struct contains contextual information about the pieces of the // page the user dragged. The parent uses this notification to initiate a // drag session at the OS level. - IPC_MESSAGE_ROUTED1(ViewHostMsg_StartDragging, - WebDropData /* drop_data */) + IPC_MESSAGE_ROUTED2(ViewHostMsg_StartDragging, + WebDropData /* drop_data */, + WebKit::WebDragOperationsMask /* ops_allowed */) // The page wants to update the mouse cursor during a drag & drop operation. // |is_drop_target| is true if the mouse is over a valid drop target. IPC_MESSAGE_ROUTED1(ViewHostMsg_UpdateDragCursor, - bool /* is_drop_target */) + WebKit::WebDragOperation /* drag_operation */) // Tells the browser to move the focus to the next (previous if reverse is // true) focusable element. |