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 /webkit/glue/dragclient_impl.cc | |
| 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 'webkit/glue/dragclient_impl.cc')
| -rw-r--r-- | webkit/glue/dragclient_impl.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/webkit/glue/dragclient_impl.cc b/webkit/glue/dragclient_impl.cc index 661a7a0..75a8ba9 100644 --- a/webkit/glue/dragclient_impl.cc +++ b/webkit/glue/dragclient_impl.cc @@ -16,6 +16,7 @@ #include "webkit/glue/webview_impl.h" using WebKit::WebDragData; +using WebKit::WebPoint; void DragClientImpl::willPerformDragDestinationAction( WebCore::DragDestinationAction, @@ -59,7 +60,14 @@ void DragClientImpl::startDrag(WebCore::DragImageRef drag_image, WebDragData drag_data = webkit_glue::ChromiumDataObjectToWebDragData( static_cast<WebCore::ClipboardChromium*>(clipboard)->dataObject()); - webview_->StartDragging(drag_data); + WebCore::DragOperation drag_operation_mask; + if (!clipboard->sourceOperation(drag_operation_mask)) { + drag_operation_mask = WebCore::DragOperationEvery; + } + + webview_->StartDragging(webkit_glue::IntPointToWebPoint(event_pos), + drag_data, + static_cast<WebKit::WebDragOperationsMask>(drag_operation_mask)); } WebCore::DragImageRef DragClientImpl::createDragImageForLink( |