webkit/glue/dragclient_impl.cc - Issue 174364: Plumb the DragOperation through all the layers between the platform DnD code ...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/glue/dragclient_impl.cc

Issue 174364: Plumb the DragOperation through all the layers between the platform DnD code ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 3 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 | « webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/drag-in-frames-expected.txt ('k') | webkit/glue/webview.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/glue/dragclient_impl.cc

===================================================================

--- webkit/glue/dragclient_impl.cc (revision 25321)

+++ webkit/glue/dragclient_impl.cc (working copy)

@@ -28,6 +28,7 @@

#include "webkit/glue/webview_impl.h"

using WebKit::WebDragData;

+using WebKit::WebPoint;

void DragClientImpl::willPerformDragDestinationAction(

WebCore::DragDestinationAction,

@@ -71,7 +72,14 @@

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(