From da27d9e35e23719a828d563998741da8c6f40bc1 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 9 Nov 2016 11:46:33 +0100 Subject: 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 Reviewed-by: Viktor Engelmann --- src/core/web_contents_adapter.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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(); } -- cgit v1.2.3