diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-14 17:56:19 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 18:10:28 +0100 |
commit | f67e53d038a78f0ca1bc1ccdbfecfbcddfc2f816 (patch) | |
tree | 264052047f8730f9ea5c20b7a1c19e8a48cc7fde /src/core/web_contents_view_qt.cpp | |
parent | 10a9cda2c25aa453ad1fa7a0b6fbf3426f886971 (diff) |
Avoid locking up the web view when starting a drag
We currently don't have an implementation for drag and drop and
we need to explicitly call SystemDragEnded to avoid leaving the
render process in an inconsisten state.
See http://crbug.com/157134
Change-Id: I52220602d4e4832d11ef601589a588c91bb81285
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/web_contents_view_qt.cpp')
-rw-r--r-- | src/core/web_contents_view_qt.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp index 8fdcf4679..2ab5b483c 100644 --- a/src/core/web_contents_view_qt.cpp +++ b/src/core/web_contents_view_qt.cpp @@ -131,6 +131,17 @@ void WebContentsViewQt::ShowContextMenu(const content::ContextMenuParams ¶ms m_client->contextMenuRequested(contextMenuData); } +void WebContentsViewQt::StartDragging(const content::DropData& drop_data, WebKit::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const content::DragEventSourceInfo& event_info) +{ + Q_UNUSED(drop_data); + Q_UNUSED(allowed_ops); + Q_UNUSED(image); + Q_UNUSED(image_offset); + Q_UNUSED(event_info); + // Tell the renderer to cancel the drag, see StartDragging's declaration in render_view_host_delegate_view.h for info. + m_webContents->SystemDragEnded(); +} + void WebContentsViewQt::TakeFocus(bool reverse) { m_client->passOnFocus(reverse); |