diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 16:19:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:39 +0000 |
| commit | f1e2b2d80366b43ba638290bca55272b000b3ce1 (patch) | |
| tree | 9b3d4708f0cd80a1c73aeacdbf3b5640c7fa80ab /src/core/web_contents_adapter.cpp | |
| parent | baaab31631dcff6075418c95f0220e8fb207dd50 (diff) | |
Adaptations to Chromium 53
Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index ec6dc90cd..6cbfe2867 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -890,7 +890,7 @@ void WebContentsAdapter::download(const QUrl &url, const QString &suggestedFileN dlm->SetDelegate(dlmd); std::unique_ptr<content::DownloadUrlParameters> params( - content::DownloadUrlParameters::FromWebContents(webContents(), toGurl(url))); + content::DownloadUrlParameters::CreateForWebContentsMainFrame(webContents(), toGurl(url))); params->set_suggested_name(toString16(suggestedFileName)); dlm->DownloadUrl(std::move(params)); } @@ -916,7 +916,7 @@ bool WebContentsAdapter::recentlyAudible() void WebContentsAdapter::copyImageAt(const QPoint &location) { Q_D(WebContentsAdapter); - d->webContents->GetRenderViewHost()->CopyImageAt(location.x(), location.y()); + d->webContents->GetRenderViewHost()->GetMainFrame()->CopyImageAt(location.x(), location.y()); } ASSERT_ENUMS_MATCH(WebContentsAdapter::MediaPlayerNoAction, blink::WebMediaPlayerAction::Unknown) @@ -1254,7 +1254,7 @@ void WebContentsAdapter::endDragging(const QPoint &clientPos, const QPoint &scre Q_D(WebContentsAdapter); finishDragUpdate(); content::RenderViewHost *rvh = d->webContents->GetRenderViewHost(); - rvh->DragTargetDrop(toGfx(clientPos), toGfx(screenPos), 0); + rvh->DragTargetDrop(*d->currentDropData, toGfx(clientPos), toGfx(screenPos), 0); } void WebContentsAdapter::leaveDrag() |