| Index: webkit/tools/test_shell/test_webview_delegate.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/test_webview_delegate.cc (revision 25321)
|
| +++ webkit/tools/test_shell/test_webview_delegate.cc (working copy)
|
| @@ -26,6 +26,7 @@
|
| #include "webkit/api/public/WebHistoryItem.h"
|
| #include "webkit/api/public/WebFrame.h"
|
| #include "webkit/api/public/WebKit.h"
|
| +#include "webkit/api/public/WebPoint.h"
|
| #include "webkit/api/public/WebScreenInfo.h"
|
| #include "webkit/api/public/WebString.h"
|
| #include "webkit/api/public/WebURL.h"
|
| @@ -59,12 +60,14 @@
|
| using WebKit::WebData;
|
| using WebKit::WebDataSource;
|
| using WebKit::WebDragData;
|
| +using WebKit::WebDragOperationsMask;
|
| using WebKit::WebFrame;
|
| using WebKit::WebHistoryItem;
|
| using WebKit::WebNavigationType;
|
| using WebKit::WebNavigationPolicy;
|
| using WebKit::WebPlugin;
|
| using WebKit::WebPluginParams;
|
| +using WebKit::WebPoint;
|
| using WebKit::WebRect;
|
| using WebKit::WebScreenInfo;
|
| using WebKit::WebSize;
|
| @@ -614,7 +617,9 @@
|
| }
|
|
|
| void TestWebViewDelegate::StartDragging(WebView* webview,
|
| - const WebDragData& drag_data) {
|
| + const WebPoint &mouse_coords,
|
| + const WebDragData& drag_data,
|
| + WebDragOperationsMask mask) {
|
| if (WebKit::layoutTestMode()) {
|
| WebDragData mutable_drag_data = drag_data;
|
| if (shell_->layout_test_controller()->ShouldAddFileToPasteboard()) {
|
| @@ -624,7 +629,7 @@
|
|
|
| // When running a test, we need to fake a drag drop operation otherwise
|
| // Windows waits for real mouse events to know when the drag is over.
|
| - EventSendingController::DoDragDrop(mutable_drag_data);
|
| + EventSendingController::DoDragDrop(mouse_coords, mutable_drag_data, mask);
|
| } else {
|
| // TODO(tc): Drag and drop is disabled in the test shell because we need
|
| // to be able to convert from WebDragData to an IDataObject.
|
|
|