diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-11-09 11:46:33 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-11-11 07:45:21 +0000 |
| commit | da27d9e35e23719a828d563998741da8c6f40bc1 (patch) | |
| tree | 9eab8296c4c2c732fbf6bad970916746a00e089d /src/core/web_contents_adapter.cpp | |
| parent | 9c982f6b654c05eb653c8d571796f52332748127 (diff) | |
Fix DCHECK when dropping items onto WebEngineView
Chromium 53 now requires to call RVH::FilterDropData() before
DragTargetDragEnter and DragTargetDrop. This fixes the DCHECK and allows
Chromium to filter the dropdata's URL (via RenderProcess::FilterURL)
before proceeding.
Task-number: QTBUG-56303
Change-Id: I29ad350b0b66d2ca1daae1d6d83f6e01206d1250
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 31ba2580f..d582993b7 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -1203,6 +1203,7 @@ void WebContentsAdapter::enterDrag(QDragEnterEvent *e, const QPoint &screenPos) } content::RenderViewHost *rvh = d->webContents->GetRenderViewHost(); + rvh->FilterDropData(d->currentDropData.get()); rvh->DragTargetDragEnter(*d->currentDropData, toGfx(e->pos()), toGfx(screenPos), toWeb(e->possibleActions()), flagsFromModifiers(e->keyboardModifiers())); @@ -1249,6 +1250,7 @@ void WebContentsAdapter::endDragging(const QPoint &clientPos, const QPoint &scre Q_D(WebContentsAdapter); finishDragUpdate(); content::RenderViewHost *rvh = d->webContents->GetRenderViewHost(); + rvh->FilterDropData(d->currentDropData.get()); rvh->DragTargetDrop(*d->currentDropData, toGfx(clientPos), toGfx(screenPos), 0); d->currentDropData.reset(); } |