diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 08:38:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-13 16:11:53 +0100 |
| commit | ffb13e6927ae14a7185bb45ee0dfd03973e5ebb0 (patch) | |
| tree | 1a00d0b9a36f2406056db01a228dd1ed00408361 /src/core/web_contents_view_qt.cpp | |
| parent | 0970b75122c51bb621b9435aa558b2c74ff52e9f (diff) | |
Adaptations for Chromium 85
Change-Id: I33c1af7c431055d95e0fb540246765cce684de15
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/web_contents_view_qt.cpp')
| -rw-r--r-- | src/core/web_contents_view_qt.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp index 3388d5161..d85b7dd19 100644 --- a/src/core/web_contents_view_qt.cpp +++ b/src/core/web_contents_view_qt.cpp @@ -122,12 +122,13 @@ gfx::NativeView WebContentsViewQt::GetNativeView() const return nullptr; } -void WebContentsViewQt::GetContainerBounds(gfx::Rect* out) const +gfx::Rect WebContentsViewQt::GetContainerBounds() const { if (m_client) { const QRectF r(m_client->viewportRect()); - *out = gfx::Rect(r.x(), r.y(), r.width(), r.height()); + return gfx::Rect(r.x(), r.y(), r.width(), r.height()); } + return gfx::Rect(); } void WebContentsViewQt::Focus() @@ -192,17 +193,17 @@ static inline WebEngineContextMenuData fromParams(const content::ContextMenuPara WebEngineContextMenuData ret; ret.setPosition(QPoint(params.x, params.y)); ret.setLinkUrl(toQt(params.link_url)); - ret.setLinkText(toQt(params.link_text.data())); - ret.setAltText(toQt(params.alt_text.data())); - ret.setTitleText(toQt(params.title_text.data())); + ret.setLinkText(toQt(params.link_text)); + ret.setAltText(toQt(params.alt_text)); + ret.setTitleText(toQt(params.title_text)); ret.setUnfilteredLinkUrl(toQt(params.unfiltered_link_url)); - ret.setSelectedText(toQt(params.selection_text.data())); + ret.setSelectedText(toQt(params.selection_text)); ret.setMediaUrl(toQt(params.src_url)); ret.setMediaType((WebEngineContextMenuData::MediaType)params.media_type); ret.setHasImageContent(params.has_image_contents); ret.setMediaFlags((WebEngineContextMenuData::MediaFlags)params.media_flags); ret.setEditFlags((WebEngineContextMenuData::EditFlags)params.edit_flags); - ret.setSuggestedFileName(toQt(params.suggested_filename.data())); + ret.setSuggestedFileName(toQt(params.suggested_filename)); ret.setIsEditable(params.is_editable); #if QT_CONFIG(webengine_spellchecker) ret.setMisspelledWord(toQt(params.misspelled_word)); |