Merge all webenginecontextmenudata wrappers into one class

Introduce new class qwebenginecontextmenurequest in core which merges:

* qquickwebenginecontextmenurequest
* qwebenginecontextmenudata
* implictly shared webenginecontextdata

Unfortunately new class has to be QObject, since we want to reuse it qml.
Q_GADGET can be used only as a value type, however we need to know if
request is accepted or not in qml, therefore it must be passed
as pointer. Since we use QObject now, class is no longer implicitly
shared, however we only allocate request once and reuse the object for
every new request (it is still copied in qml just to keep it aligned
with other request handlers)

[ChangleLog] QWebEngineContextMenuRequest is replacement for
QWebEngineContextMenuData

Change-Id: Ib387ec2065361a4bacc20675ca7352ab75a0e436
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

8 files changed, 326 insertions, 625 deletions

diff --git a/src/webengine/api/qquickwebenginecontextmenurequest.cpp b/src/webengine/api/qquickwebenginecontextmenurequest.cpp
deleted file mode 100644
index e1ebd4c8c..000000000
--- a/src/webengine/api/qquickwebenginecontextmenurequest.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickwebenginecontextmenurequest_p.h"
-#include "web_contents_adapter_client.h"
-
-QT_BEGIN_NAMESPACE
-
-// Match MediaType enum
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeNone,
-                   QQuickWebEngineContextMenuRequest::MediaTypeNone)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeImage,
-                   QQuickWebEngineContextMenuRequest::MediaTypeImage)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeAudio,
-                   QQuickWebEngineContextMenuRequest::MediaTypeAudio)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeVideo,
-                   QQuickWebEngineContextMenuRequest::MediaTypeVideo)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeCanvas,
-                   QQuickWebEngineContextMenuRequest::MediaTypeCanvas)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeFile,
-                   QQuickWebEngineContextMenuRequest::MediaTypeFile)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypePlugin,
-                   QQuickWebEngineContextMenuRequest::MediaTypePlugin)
-
-// Match MediaFlag enum
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaInError,
-                   QQuickWebEngineContextMenuRequest::MediaInError)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaPaused,
-                   QQuickWebEngineContextMenuRequest::MediaPaused)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaMuted,
-                   QQuickWebEngineContextMenuRequest::MediaMuted)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaLoop,
-                   QQuickWebEngineContextMenuRequest::MediaLoop)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanSave,
-                   QQuickWebEngineContextMenuRequest::MediaCanSave)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaHasAudio,
-                   QQuickWebEngineContextMenuRequest::MediaHasAudio)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanToggleControls,
-                   QQuickWebEngineContextMenuRequest::MediaCanToggleControls)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaControls,
-                   QQuickWebEngineContextMenuRequest::MediaControls)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanPrint,
-                   QQuickWebEngineContextMenuRequest::MediaCanPrint)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanRotate,
-                   QQuickWebEngineContextMenuRequest::MediaCanRotate)
-
-// Match EditFlag enum
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanUndo,
-                   QQuickWebEngineContextMenuRequest::CanUndo)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanRedo,
-                   QQuickWebEngineContextMenuRequest::CanRedo)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanCut,
-                   QQuickWebEngineContextMenuRequest::CanCut)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanCopy,
-                   QQuickWebEngineContextMenuRequest::CanCopy)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanPaste,
-                   QQuickWebEngineContextMenuRequest::CanPaste)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanDelete,
-                   QQuickWebEngineContextMenuRequest::CanDelete)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanSelectAll,
-                   QQuickWebEngineContextMenuRequest::CanSelectAll)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanTranslate,
-                   QQuickWebEngineContextMenuRequest::CanTranslate)
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanEditRichly,
-                   QQuickWebEngineContextMenuRequest::CanEditRichly)
-
-/*!
-    \qmltype ContextMenuRequest
-    \instantiates QQuickWebEngineContextMenuRequest
-    \inqmlmodule QtWebEngine
-    \since QtWebEngine 1.4
-
-    \brief A request for showing a context menu.
-
-    A ContextMenuRequest is passed as an argument of the
-    WebEngineView::contextMenuRequested signal. It provides further
-    information about the context of the request. The position of the
-    request origin can be found via the \l x and \l y properties.
-
-    The \l accepted property of the request indicates whether the request
-    is handled by the user code or the default context menu should
-    be displayed.
-
-    The following code uses a custom menu to handle the request:
-
-    \code
-    WebEngineView {
-        id: view
-        // ...
-        onContextMenuRequested: function(request) {
-            request.accepted = true;
-            myMenu.x = request.x;
-            myMenu.y = request.y;
-            myMenu.trigger.connect(view.triggerWebAction);
-            myMenu.popup();
-        }
-        // ...
-    }
-    \endcode
-*/
-
-QQuickWebEngineContextMenuRequest::QQuickWebEngineContextMenuRequest(
-        const QtWebEngineCore::WebEngineContextMenuData &data, QObject *parent):
-    QObject(parent)
-  , m_data(new QtWebEngineCore::WebEngineContextMenuData(data))
-  , m_accepted(false)
-{
-}
-
-QQuickWebEngineContextMenuRequest::~QQuickWebEngineContextMenuRequest()
-{
-}
-
-/*!
-    \qmlproperty int ContextMenuRequest::x
-    \readonly
-
-    The x coordinate of the user action from where the context
-    menu request originates.
-*/
-
-int QQuickWebEngineContextMenuRequest::x() const
-{
-    return m_data->position().x();
-}
-
-/*!
-    \qmlproperty int ContextMenuRequest::y
-    \readonly
-
-    The y coordinate of the user action from where the context
-    menu request originates.
-*/
-
-int QQuickWebEngineContextMenuRequest::y() const
-{
-    return m_data->position().y();
-}
-
-/*!
-    \qmlproperty string ContextMenuRequest::selectedText
-    \readonly
-
-    The selected text the context menu was created for.
-*/
-
-QString QQuickWebEngineContextMenuRequest::selectedText() const
-{
-    return m_data->selectedText();
-}
-
-/*!
-    \qmlproperty string ContextMenuRequest::linkText
-    \readonly
-
-    The text of the link if the context menu was requested for a link.
-*/
-
-QString QQuickWebEngineContextMenuRequest::linkText() const
-{
-    return m_data->linkText();
-}
-
-/*!
-    \qmlproperty url ContextMenuRequest::linkUrl
-    \readonly
-
-    The URL of the link if the selected web page content is a link.
-    It is not guaranteed to be a valid URL.
-*/
-
-QUrl QQuickWebEngineContextMenuRequest::linkUrl() const
-{
-    return m_data->unfilteredLinkUrl();
-}
-
-/*!
-    \qmlproperty url ContextMenuRequest::mediaUrl
-    \readonly
-
-    The URL of media if the selected web content is a media element.
-*/
-
-QUrl QQuickWebEngineContextMenuRequest::mediaUrl() const
-{
-    return m_data->mediaUrl();
-}
-
-/*!
-    \qmlproperty enumeration ContextMenuRequest::mediaType
-    \readonly
-
-    The type of the media element or \c MediaTypeNone if
-    the selected web page content is not a media element.
-
-    \value  ContextMenuRequest.MediaTypeNone
-            Not a media.
-    \value  ContextMenuRequest.MediaTypeImage
-            An image.
-    \value  ContextMenuRequest.MediaTypeVideo
-            A video.
-    \value  ContextMenuRequest.MediaTypeAudio
-            An audio element.
-    \value  ContextMenuRequest.MediaTypeCanvas
-            A canvas.
-    \value  ContextMenuRequest.MediaTypeFile
-            A file.
-    \value  ContextMenuRequest.MediaTypePlugin
-            A plugin.
-*/
-
-QQuickWebEngineContextMenuRequest::MediaType QQuickWebEngineContextMenuRequest::mediaType() const
-{
-    return static_cast<QQuickWebEngineContextMenuRequest::MediaType>(m_data->mediaType());
-}
-
-/*!
-    \qmlproperty bool ContextMenuRequest::isContentEditable
-    \readonly
-
-    Indicates whether the selected web content is editable.
-*/
-
-bool QQuickWebEngineContextMenuRequest::isContentEditable() const
-{
-    return m_data->isEditable();
-}
-
-/*!
-    \qmlproperty string ContextMenuRequest::misspelledWord
-    \readonly
-
-    If the context is a word considered misspelled by the spell-checker,
-    returns the misspelled word.
-*/
-
-QString QQuickWebEngineContextMenuRequest::misspelledWord() const
-{
-    return m_data->misspelledWord();
-}
-
-/*!
-    \qmlproperty stringlist ContextMenuRequest::spellCheckerSuggestions
-    \readonly
-
-    If the context is a word considered misspelled by the spell-checker,
-    returns a list of suggested replacements.
-*/
-
-QStringList QQuickWebEngineContextMenuRequest::spellCheckerSuggestions() const
-{
-    return m_data->spellCheckerSuggestions();
-}
-
-/*!
-    \qmlproperty bool ContextMenuRequest::accepted
-
-    Indicates whether the context menu request has been
-    handled by the signal handler.
-
-    If the property is \c false after any signal handlers
-    for WebEngineView::contextMenuRequested have been executed,
-    a default context menu will be shown.
-    To prevent this, set \c{request.accepted} to \c true.
-
-    The default is \c false.
-
-    \note The default content of the context menu depends on the
-    web element for which the request was actually generated.
-*/
-
-bool QQuickWebEngineContextMenuRequest::isAccepted() const
-{
-    return m_accepted;
-}
-
-void QQuickWebEngineContextMenuRequest::setAccepted(bool accepted)
-{
-    m_accepted = accepted;
-}
-
-/*!
-    \qmlproperty flags ContextMenuRequest::mediaFlags
-    \readonly
-    \since QtWebEngine 1.7
-
-    The current media element's status and its available operations.
-    \c MediaNone if the selected web page content is not a media element.
-
-    \value  ContextMenuRequest.MediaInError
-            An error occurred.
-    \value  ContextMenuRequest.MediaPaused
-            Media is paused.
-    \value  ContextMenuRequest.MediaMuted
-            Media is muted.
-    \value  ContextMenuRequest.MediaLoop
-            Media can be looped.
-    \value  ContextMenuRequest.MediaCanSave
-            Media can be saved.
-    \value  ContextMenuRequest.MediaHasAudio
-            Media has audio.
-    \value  ContextMenuRequest.MediaCanToggleControls
-            Media can show controls.
-    \value  ContextMenuRequest.MediaControls
-            Media controls are shown.
-    \value  ContextMenuRequest.MediaCanPrint
-            Media is printable.
-    \value  ContextMenuRequest.MediaCanRotate
-            Media is rotatable.
-*/
-QQuickWebEngineContextMenuRequest::MediaFlags QQuickWebEngineContextMenuRequest::mediaFlags() const
-{
-    return static_cast<QQuickWebEngineContextMenuRequest::MediaFlags>(m_data->mediaFlags());
-}
-
-/*!
-    \qmlproperty flags ContextMenuRequest::editFlags
-    \readonly
-    \since QtWebEngine 1.7
-
-    The available edit operations in the current context or \c CanDoNone if no actions are available.
-
-    \value  ContextMenuRequest.CanUndo
-            Undo is available.
-    \value  ContextMenuRequest.CanRedo
-            Redo is available.
-    \value  ContextMenuRequest.CanCut
-            Cut is available.
-    \value  ContextMenuRequest.CanCopy
-            Copy is available.
-    \value  ContextMenuRequest.CanPaste
-            Paste is available.
-    \value  ContextMenuRequest.CanDelete
-            Delete is available.
-    \value  ContextMenuRequest.CanSelectAll
-            Select All is available.
-    \value  ContextMenuRequest.CanTranslate
-            Translate is available.
-    \value  ContextMenuRequest.CanEditRichly
-            Context is richly editable.
-*/
-QQuickWebEngineContextMenuRequest::EditFlags QQuickWebEngineContextMenuRequest::editFlags() const
-{
-    return static_cast<QQuickWebEngineContextMenuRequest::EditFlags>(m_data->editFlags());
-}
-
-QT_END_NAMESPACE
diff --git a/src/webengine/api/qquickwebenginecontextmenurequest_p.h b/src/webengine/api/qquickwebenginecontextmenurequest_p.h
deleted file mode 100644
index bc50eccb8..000000000
--- a/src/webengine/api/qquickwebenginecontextmenurequest_p.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKWEBENGINECONTEXTMENUREQUEST_H
-#define QQUICKWEBENGINECONTEXTMENUREQUEST_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
-
-namespace QtWebEngineCore {
-    class WebEngineContextMenuData;
-}
-
-QT_BEGIN_NAMESPACE
-
-class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineContextMenuRequest: public QObject {
-    Q_OBJECT
-public:
-    enum MediaType {
-        MediaTypeNone,
-        MediaTypeImage,
-        MediaTypeVideo,
-        MediaTypeAudio,
-        MediaTypeCanvas,
-        MediaTypeFile,
-        MediaTypePlugin
-    };
-    Q_ENUM(MediaType)
-
-    // Must match QWebEngineCore::WebEngineContextMenuData::MediaFlags:
-    enum MediaFlag {
-        MediaInError = 0x1,
-        MediaPaused = 0x2,
-        MediaMuted = 0x4,
-        MediaLoop = 0x8,
-        MediaCanSave = 0x10,
-        MediaHasAudio = 0x20,
-        MediaCanToggleControls = 0x40,
-        MediaControls = 0x80,
-        MediaCanPrint = 0x100,
-        MediaCanRotate = 0x200,
-    };
-    Q_DECLARE_FLAGS(MediaFlags, MediaFlag)
-    Q_FLAG(MediaFlags)
-
-    // Must match QWebEngineCore::WebEngineContextMenuData::EditFlags:
-    enum EditFlag {
-        CanUndo = 0x1,
-        CanRedo = 0x2,
-        CanCut = 0x4,
-        CanCopy = 0x8,
-        CanPaste = 0x10,
-        CanDelete = 0x20,
-        CanSelectAll = 0x40,
-        CanTranslate = 0x80,
-        CanEditRichly = 0x100,
-    };
-    Q_DECLARE_FLAGS(EditFlags, EditFlag)
-    Q_FLAG(EditFlags)
-
-    Q_PROPERTY(int x READ x CONSTANT FINAL)
-    Q_PROPERTY(int y READ y CONSTANT FINAL)
-    Q_PROPERTY(QString selectedText READ selectedText CONSTANT FINAL)
-    Q_PROPERTY(QString linkText READ linkText CONSTANT FINAL)
-    Q_PROPERTY(QUrl linkUrl READ linkUrl CONSTANT FINAL)
-    Q_PROPERTY(QUrl mediaUrl READ mediaUrl CONSTANT FINAL)
-    Q_PROPERTY(MediaType mediaType READ mediaType CONSTANT FINAL)
-    Q_PROPERTY(bool isContentEditable READ isContentEditable CONSTANT FINAL)
-    Q_PROPERTY(QString misspelledWord READ misspelledWord CONSTANT FINAL)
-    Q_PROPERTY(QStringList spellCheckerSuggestions READ spellCheckerSuggestions CONSTANT FINAL)
-    Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL)
-    Q_PROPERTY(MediaFlags mediaFlags READ mediaFlags CONSTANT FINAL REVISION 1)
-    Q_PROPERTY(EditFlags editFlags READ editFlags CONSTANT FINAL REVISION 1)
-
-    ~QQuickWebEngineContextMenuRequest();
-    int x() const;
-    int y() const;
-    QString selectedText() const;
-    QString linkText() const;
-    QUrl linkUrl() const;
-    QUrl mediaUrl() const;
-    MediaType mediaType() const;
-    bool isContentEditable() const;
-    QString misspelledWord() const;
-    QStringList spellCheckerSuggestions() const;
-    bool isAccepted() const;
-    void setAccepted(bool accepted);
-    MediaFlags mediaFlags() const;
-    EditFlags editFlags() const;
-
-private:
-    QQuickWebEngineContextMenuRequest(const QtWebEngineCore::WebEngineContextMenuData &data, QObject *parent = nullptr);
-    QScopedPointer<QtWebEngineCore::WebEngineContextMenuData> m_data;
-    bool m_accepted;
-    friend class QQuickWebEngineView;
-    friend class QQuickWebEngineViewPrivate;
-    Q_DISABLE_COPY(QQuickWebEngineContextMenuRequest)
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICKWEBENGINECONTEXTMENUREQUEST_H
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 8a426c887..ecbde46e6 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -52,7 +52,6 @@
 #include "qquickwebenginehistory_p.h"
 #include "qquickwebenginecertificateerror_p.h"
 #include "qquickwebengineclientcertificateselection_p.h"
-#include "qquickwebenginecontextmenurequest_p.h"
 #include "qquickwebenginedialogrequests_p.h"
 #include "qquickwebenginefaviconprovider_p_p.h"
 #include "qquickwebengineloadrequest_p.h"
@@ -135,6 +134,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
     , m_zoomFactor(1.0)
     , m_ui2Enabled(false)
     , m_profileInitialized(false)
+    , m_contextMenuRequest(nullptr)
 {
     memset(actions, 0, sizeof(actions));
 
@@ -229,13 +229,15 @@ RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHo
     return quickDelegate;
 }
 
-void QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenuData &data)
+void QQuickWebEngineViewPrivate::contextMenuRequested(QWebEngineContextMenuRequest *request)
 {
     Q_Q(QQuickWebEngineView);
 
-    m_contextMenuData = data;
+    m_contextMenuRequest = request;
 
-    QQuickWebEngineContextMenuRequest *request = new QQuickWebEngineContextMenuRequest(data);
+    // FIXME: we most liekly do not need to make any copy here
+    auto *r = new QWebEngineContextMenuRequest(
+            new QWebEngineContextMenuRequestPrivate(*request->d.data()));
     QQmlEngine *engine = qmlEngine(q);
 
     // TODO: this is a workaround for QTBUG-65044
@@ -243,19 +245,19 @@ void QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
         return;
 
     // mark the object for gc by creating temporary jsvalue
-    engine->newQObject(request);
-    Q_EMIT q->contextMenuRequested(request);
+    engine->newQObject(r);
+    Q_EMIT q->contextMenuRequested(r);
 
-    if (request->isAccepted())
+    if (r->isAccepted())
         return;
 
     // Assign the WebEngineView as the parent of the menu, so mouse events are properly propagated
     // on OSX.
-    QObject *menu = ui()->addMenu(q, QString(), data.position());
+    QObject *menu = ui()->addMenu(q, QString(), r->position());
     if (!menu)
         return;
 
-    QQuickContextMenuBuilder contextMenuBuilder(data, q, menu);
+    QQuickContextMenuBuilder contextMenuBuilder(r, q, menu);
 
     // Populate our menu
     contextMenuBuilder.initMenu();
@@ -1817,32 +1819,33 @@ void QQuickWebEngineView::triggerWebAction(WebAction action)
         d->adapter->unselect();
         break;
     case OpenLinkInThisWindow:
-        if (d->m_contextMenuData.linkUrl().isValid())
-            setUrl(d->m_contextMenuData.linkUrl());
+        if (d->m_contextMenuRequest->filteredLinkUrl().isValid())
+            setUrl(d->m_contextMenuRequest->filteredLinkUrl());
         break;
     case OpenLinkInNewWindow:
-        if (d->m_contextMenuData.linkUrl().isValid()) {
+        if (d->m_contextMenuRequest->filteredLinkUrl().isValid()) {
             QQuickWebEngineNewViewRequest request;
-            request.m_requestedUrl = d->m_contextMenuData.linkUrl();
+            request.m_requestedUrl = d->m_contextMenuRequest->filteredLinkUrl();
             request.m_isUserInitiated = true;
             request.m_destination = NewViewInWindow;
             Q_EMIT newViewRequested(&request);
         }
         break;
     case OpenLinkInNewTab:
-        if (d->m_contextMenuData.linkUrl().isValid()) {
+        if (d->m_contextMenuRequest->filteredLinkUrl().isValid()) {
             QQuickWebEngineNewViewRequest request;
-            request.m_requestedUrl = d->m_contextMenuData.linkUrl();
+            request.m_requestedUrl = d->m_contextMenuRequest->filteredLinkUrl();
             request.m_isUserInitiated = true;
             request.m_destination = NewViewInBackgroundTab;
             Q_EMIT newViewRequested(&request);
         }
         break;
     case CopyLinkToClipboard:
-        if (!d->m_contextMenuData.unfilteredLinkUrl().isEmpty()) {
-            QString urlString = d->m_contextMenuData.unfilteredLinkUrl().toString(QUrl::FullyEncoded);
-            QString linkText = d->m_contextMenuData.linkText().toHtmlEscaped();
-            QString title = d->m_contextMenuData.titleText();
+        if (!d->m_contextMenuRequest->unfilteredLinkUrl().isEmpty()) {
+            QString urlString =
+                    d->m_contextMenuRequest->unfilteredLinkUrl().toString(QUrl::FullyEncoded);
+            QString linkText = d->m_contextMenuRequest->linkText().toHtmlEscaped();
+            QString title = d->m_contextMenuRequest->titleText();
             if (!title.isEmpty())
                 title = QStringLiteral(" title=\"%1\"").arg(title.toHtmlEscaped());
             QMimeData *data = new QMimeData();
@@ -1850,99 +1853,118 @@ void QQuickWebEngineView::triggerWebAction(WebAction action)
             QString html = QStringLiteral("<a href=\"") + urlString + QStringLiteral("\"") + title + QStringLiteral(">")
                          + linkText + QStringLiteral("</a>");
             data->setHtml(html);
-            data->setUrls(QList<QUrl>() << d->m_contextMenuData.unfilteredLinkUrl());
+            data->setUrls(QList<QUrl>() << d->m_contextMenuRequest->unfilteredLinkUrl());
             qApp->clipboard()->setMimeData(data);
         }
         break;
     case DownloadLinkToDisk:
-        if (d->m_contextMenuData.linkUrl().isValid())
-            d->adapter->download(d->m_contextMenuData.linkUrl(), d->m_contextMenuData.suggestedFileName(),
-                                 d->m_contextMenuData.referrerUrl(), d->m_contextMenuData.referrerPolicy());
+        if (d->m_contextMenuRequest->filteredLinkUrl().isValid())
+            d->adapter->download(d->m_contextMenuRequest->filteredLinkUrl(),
+                                 d->m_contextMenuRequest->suggestedFileName(),
+                                 d->m_contextMenuRequest->referrerUrl(),
+                                 d->m_contextMenuRequest->referrerPolicy());
         break;
     case CopyImageToClipboard:
-        if (d->m_contextMenuData.hasImageContent() &&
-                (d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeImage ||
-                 d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeCanvas))
-        {
-            d->adapter->copyImageAt(d->m_contextMenuData.position());
+        if (d->m_contextMenuRequest->hasImageContent()
+            && (d->m_contextMenuRequest->mediaType() == QWebEngineContextMenuRequest::MediaTypeImage
+                || d->m_contextMenuRequest->mediaType()
+                        == QWebEngineContextMenuRequest::MediaTypeCanvas)) {
+            d->adapter->copyImageAt(d->m_contextMenuRequest->position());
         }
         break;
     case CopyImageUrlToClipboard:
-        if (d->m_contextMenuData.mediaUrl().isValid() && d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeImage) {
-            QString urlString = d->m_contextMenuData.mediaUrl().toString(QUrl::FullyEncoded);
-            QString alt = d->m_contextMenuData.altText();
+        if (d->m_contextMenuRequest->mediaUrl().isValid()
+            && d->m_contextMenuRequest->mediaType()
+                    == QWebEngineContextMenuRequest::MediaTypeImage) {
+            QString urlString = d->m_contextMenuRequest->mediaUrl().toString(QUrl::FullyEncoded);
+            QString alt = d->m_contextMenuRequest->altText();
             if (!alt.isEmpty())
                 alt = QStringLiteral(" alt=\"%1\"").arg(alt.toHtmlEscaped());
-            QString title = d->m_contextMenuData.titleText();
+            QString title = d->m_contextMenuRequest->titleText();
             if (!title.isEmpty())
                 title = QStringLiteral(" title=\"%1\"").arg(title.toHtmlEscaped());
             QMimeData *data = new QMimeData();
             data->setText(urlString);
             QString html = QStringLiteral("<img src=\"") + urlString + QStringLiteral("\"") + title + alt + QStringLiteral("></img>");
             data->setHtml(html);
-            data->setUrls(QList<QUrl>() << d->m_contextMenuData.mediaUrl());
+            data->setUrls(QList<QUrl>() << d->m_contextMenuRequest->mediaUrl());
             qApp->clipboard()->setMimeData(data);
         }
         break;
     case DownloadImageToDisk:
     case DownloadMediaToDisk:
-        if (d->m_contextMenuData.mediaUrl().isValid())
-            d->adapter->download(d->m_contextMenuData.mediaUrl(), d->m_contextMenuData.suggestedFileName(),
-                                 d->m_contextMenuData.referrerUrl(), d->m_contextMenuData.referrerPolicy());
+        if (d->m_contextMenuRequest->mediaUrl().isValid())
+            d->adapter->download(d->m_contextMenuRequest->mediaUrl(),
+                                 d->m_contextMenuRequest->suggestedFileName(),
+                                 d->m_contextMenuRequest->referrerUrl(),
+                                 d->m_contextMenuRequest->referrerPolicy());
         break;
     case CopyMediaUrlToClipboard:
-        if (d->m_contextMenuData.mediaUrl().isValid() &&
-                (d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeAudio ||
-                 d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeVideo))
-        {
-            QString urlString = d->m_contextMenuData.mediaUrl().toString(QUrl::FullyEncoded);
-            QString title = d->m_contextMenuData.titleText();
+        if (d->m_contextMenuRequest->mediaUrl().isValid()
+            && (d->m_contextMenuRequest->mediaType() == QWebEngineContextMenuRequest::MediaTypeAudio
+                || d->m_contextMenuRequest->mediaType()
+                        == QWebEngineContextMenuRequest::MediaTypeVideo)) {
+            QString urlString = d->m_contextMenuRequest->mediaUrl().toString(QUrl::FullyEncoded);
+            QString title = d->m_contextMenuRequest->titleText();
             if (!title.isEmpty())
                 title = QStringLiteral(" title=\"%1\"").arg(title.toHtmlEscaped());
             QMimeData *data = new QMimeData();
             data->setText(urlString);
-            if (d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeAudio)
+            if (d->m_contextMenuRequest->mediaType()
+                == QWebEngineContextMenuRequest::MediaTypeAudio)
                 data->setHtml(QStringLiteral("<audio src=\"") + urlString + QStringLiteral("\"") + title +
                               QStringLiteral("></audio>"));
             else
                 data->setHtml(QStringLiteral("<video src=\"") + urlString + QStringLiteral("\"") + title +
                               QStringLiteral("></video>"));
-            data->setUrls(QList<QUrl>() << d->m_contextMenuData.mediaUrl());
+            data->setUrls(QList<QUrl>() << d->m_contextMenuRequest->mediaUrl());
             qApp->clipboard()->setMimeData(data);
         }
         break;
     case ToggleMediaControls:
-        if (d->m_contextMenuData.mediaUrl().isValid() && d->m_contextMenuData.mediaFlags() & WebEngineContextMenuData::MediaCanToggleControls) {
-            bool enable = !(d->m_contextMenuData.mediaFlags() & WebEngineContextMenuData::MediaControls);
-            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuData.position(), WebContentsAdapter::MediaPlayerControls, enable);
+        if (d->m_contextMenuRequest->mediaUrl().isValid()
+            && d->m_contextMenuRequest->mediaFlags()
+                    & QWebEngineContextMenuRequest::MediaCanToggleControls) {
+            bool enable = !(d->m_contextMenuRequest->mediaFlags()
+                            & QWebEngineContextMenuRequest::MediaControls);
+            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuRequest->position(),
+                                                   WebContentsAdapter::MediaPlayerControls, enable);
         }
         break;
     case ToggleMediaLoop:
-        if (d->m_contextMenuData.mediaUrl().isValid() &&
-                (d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeAudio ||
-                 d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeVideo))
-        {
-            bool enable = !(d->m_contextMenuData.mediaFlags() & WebEngineContextMenuData::MediaLoop);
-            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuData.position(), WebContentsAdapter::MediaPlayerLoop, enable);
+        if (d->m_contextMenuRequest->mediaUrl().isValid()
+            && (d->m_contextMenuRequest->mediaType() == QWebEngineContextMenuRequest::MediaTypeAudio
+                || d->m_contextMenuRequest->mediaType()
+                        == QWebEngineContextMenuRequest::MediaTypeVideo)) {
+            bool enable = !(d->m_contextMenuRequest->mediaFlags()
+                            & QWebEngineContextMenuRequest::MediaLoop);
+            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuRequest->position(),
+                                                   WebContentsAdapter::MediaPlayerLoop, enable);
         }
         break;
     case ToggleMediaPlayPause:
-        if (d->m_contextMenuData.mediaUrl().isValid() &&
-                (d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeAudio ||
-                 d->m_contextMenuData.mediaType() == WebEngineContextMenuData::MediaTypeVideo))
-        {
-            bool enable = (d->m_contextMenuData.mediaFlags() & WebEngineContextMenuData::MediaPaused);
-            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuData.position(), WebContentsAdapter::MediaPlayerPlay, enable);
+        if (d->m_contextMenuRequest->mediaUrl().isValid()
+            && (d->m_contextMenuRequest->mediaType() == QWebEngineContextMenuRequest::MediaTypeAudio
+                || d->m_contextMenuRequest->mediaType()
+                        == QWebEngineContextMenuRequest::MediaTypeVideo)) {
+            bool enable = (d->m_contextMenuRequest->mediaFlags()
+                           & QWebEngineContextMenuRequest::MediaPaused);
+            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuRequest->position(),
+                                                   WebContentsAdapter::MediaPlayerPlay, enable);
         }
         break;
     case ToggleMediaMute:
-        if (d->m_contextMenuData.mediaUrl().isValid() && d->m_contextMenuData.mediaFlags() & WebEngineContextMenuData::MediaHasAudio) {
-            bool enable = !(d->m_contextMenuData.mediaFlags() & WebEngineContextMenuData::MediaMuted);
-            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuData.position(), WebContentsAdapter::MediaPlayerMute, enable);
+        if (d->m_contextMenuRequest->mediaUrl().isValid()
+            && d->m_contextMenuRequest->mediaFlags()
+                    & QWebEngineContextMenuRequest::MediaHasAudio) {
+            bool enable = !(d->m_contextMenuRequest->mediaFlags()
+                            & QWebEngineContextMenuRequest::MediaMuted);
+            d->adapter->executeMediaPlayerActionAt(d->m_contextMenuRequest->position(),
+                                                   WebContentsAdapter::MediaPlayerMute, enable);
         }
         break;
     case InspectElement:
-        d->adapter->inspectElementAt(d->m_contextMenuData.position());
+        d->adapter->inspectElementAt(d->m_contextMenuRequest->position());
         break;
     case ExitFullScreen:
         d->adapter->exitFullScreen();
@@ -2295,12 +2317,9 @@ void QQuickWebEngineFullScreenRequest::reject()
         m_viewPrivate->setFullScreenMode(!m_toggleOn);
 }
 
-QQuickContextMenuBuilder::QQuickContextMenuBuilder(const QtWebEngineCore::WebEngineContextMenuData &data,
-                                                   QQuickWebEngineView *view,
-                                                   QObject *menu)
-    : QtWebEngineCore::RenderViewContextMenuQt(data)
-    , m_view(view)
-    , m_menu(menu)
+QQuickContextMenuBuilder::QQuickContextMenuBuilder(QWebEngineContextMenuRequest *request,
+                                                   QQuickWebEngineView *view, QObject *menu)
+    : QtWebEngineCore::RenderViewContextMenuQt(request), m_view(view), m_menu(menu)
 {
 }
 
@@ -2408,9 +2427,9 @@ void QQuickContextMenuBuilder::addMenuItem(ContextMenuItem menuItem)
     case ContextMenuItem::SpellingSuggestions:
     {
         QPointer<QQuickWebEngineView> thisRef(m_view);
-        for (int i=0; i < m_contextData.spellCheckerSuggestions().count() && i < 4; i++) {
+        for (int i = 0; i < m_contextData->spellCheckerSuggestions().count() && i < 4; i++) {
             action = new QQuickWebEngineAction(m_menu);
-            QString replacement = m_contextData.spellCheckerSuggestions().at(i);
+            QString replacement = m_contextData->spellCheckerSuggestions().at(i);
             QObject::connect(action, &QQuickWebEngineAction::triggered, [thisRef, replacement] { thisRef->replaceMisspelledWord(replacement); });
             m_view->d_ptr->ui()->addMenuItem(action, m_menu);
         }
@@ -2435,19 +2454,19 @@ bool QQuickContextMenuBuilder::isMenuItemEnabled(ContextMenuItem menuItem)
     case ContextMenuItem::Reload:
         return true;
     case ContextMenuItem::Cut:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanCut;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanCut;
     case ContextMenuItem::Copy:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanCopy;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanCopy;
     case ContextMenuItem::Paste:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanPaste;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanPaste;
     case ContextMenuItem::Undo:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanUndo;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanUndo;
     case ContextMenuItem::Redo:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanRedo;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanRedo;
     case ContextMenuItem::SelectAll:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanSelectAll;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanSelectAll;
     case ContextMenuItem::PasteAndMatchStyle:
-        return m_contextData.editFlags() & QtWebEngineCore::WebEngineContextMenuData::CanPaste;
+        return m_contextData->editFlags() & QWebEngineContextMenuRequest::CanPaste;
     case ContextMenuItem::OpenLinkInNewWindow:
     case ContextMenuItem::OpenLinkInNewTab:
     case ContextMenuItem::CopyLinkToClipboard:
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 86b7145db..1ac383ba6 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -72,7 +72,6 @@ class QQuickWebEngineAuthenticationDialogRequest;
 class QQuickWebEngineCertificateError;
 class QQuickWebEngineClientCertificateSelection;
 class QQuickWebEngineColorDialogRequest;
-class QQuickWebEngineContextMenuRequest;
 class QQuickWebEngineFaviconProvider;
 class QQuickWebEngineFileDialogRequest;
 class QQuickWebEngineHistory;
@@ -87,6 +86,7 @@ class QQuickWebEngineViewPrivate;
 class QWebEngineFindTextResult;
 class QWebEngineQuotaRequest;
 class QWebEngineRegisterProtocolHandlerRequest;
+class QWebEngineContextMenuRequest;
 
 #if QT_CONFIG(webengine_testsupport)
 class QQuickWebEngineTestSupport;
@@ -569,7 +569,7 @@ Q_SIGNALS:
     Q_REVISION(3) void audioMutedChanged(bool muted);
     Q_REVISION(3) void recentlyAudibleChanged(bool recentlyAudible);
     Q_REVISION(3) void webChannelWorldChanged(uint);
-    Q_REVISION(4) void contextMenuRequested(QQuickWebEngineContextMenuRequest *request);
+    Q_REVISION(4) void contextMenuRequested(QWebEngineContextMenuRequest *request);
     Q_REVISION(4) void authenticationDialogRequested(QQuickWebEngineAuthenticationDialogRequest *request);
     Q_REVISION(4) void javaScriptDialogRequested(QQuickWebEngineJavaScriptDialogRequest *request);
     Q_REVISION(4) void colorDialogRequested(QQuickWebEngineColorDialogRequest *request);
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index bfed75f45..21f813a33 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
 class QQuickWebEngineView;
 class QQmlComponent;
 class QQmlContext;
-class QQuickWebEngineContextMenuRequest;
+class QWebEngineContextMenuRequest;
 class QQuickWebEngineSettings;
 class QQuickWebEngineFaviconProvider;
 class QQuickWebEngineProfilePrivate;
@@ -128,7 +128,7 @@ public:
     void windowCloseRejected() override;
     void requestFullScreenMode(const QUrl &origin, bool fullscreen) override;
     bool isFullScreenMode() const override;
-    void contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &) override;
+    void contextMenuRequested(QWebEngineContextMenuRequest *request) override;
     void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) override;
     void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) override;
     void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) override;
@@ -200,7 +200,6 @@ public:
     QQuickWebEngineTestSupport *m_testSupport;
 #endif
     QQmlComponent *contextMenuExtraItems;
-    QtWebEngineCore::WebEngineContextMenuData m_contextMenuData;
     QUrl m_url;
     QString m_html;
     QUrl iconUrl;
@@ -237,6 +236,7 @@ private:
     qreal m_zoomFactor;
     bool m_ui2Enabled;
     bool m_profileInitialized;
+    QWebEngineContextMenuRequest *m_contextMenuRequest;
     LoadVisuallyCommittedState m_loadVisuallyCommittedState = NotCommitted;
 };
 
@@ -263,7 +263,8 @@ private:
 class QQuickContextMenuBuilder : public QtWebEngineCore::RenderViewContextMenuQt
 {
 public:
-    QQuickContextMenuBuilder(const QtWebEngineCore::WebEngineContextMenuData &data, QQuickWebEngineView *view, QObject *menu);
+    QQuickContextMenuBuilder(QWebEngineContextMenuRequest *data, QQuickWebEngineView *view,
+                             QObject *menu);
     void appendExtraItems(QQmlEngine *engine);
 
 private:
diff --git a/src/webengine/doc/src/context_menu_request.qdoc b/src/webengine/doc/src/context_menu_request.qdoc
new file mode 100644
index 000000000..cc812dcf2
--- /dev/null
+++ b/src/webengine/doc/src/context_menu_request.qdoc
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \qmltype ContextMenuRequest
+    \instantiates QQuickWebEngineContextMenuRequest
+    \inqmlmodule QtWebEngine
+    \since QtWebEngine 1.4
+
+    \brief A request for showing a context menu.
+
+    A ContextMenuRequest is passed as an argument of the
+    WebEngineView::contextMenuRequested signal. It provides further
+    information about the context of the request. The position of the
+    request origin can be found via the \l x and \l y properties.
+
+    The \l accepted property of the request indicates whether the request
+    is handled by the user code or the default context menu should
+    be displayed.
+
+    The following code uses a custom menu to handle the request:
+
+    \code
+    WebEngineView {
+        id: view
+        // ...
+        onContextMenuRequested: function(request) {
+            request.accepted = true;
+            myMenu.x = request.x;
+            myMenu.y = request.y;
+            myMenu.trigger.connect(view.triggerWebAction);
+            myMenu.popup();
+        }
+        // ...
+    }
+    \endcode
+*/
+
+/*!
+    \qmlproperty point ContextMenuRequest::position
+    \readonly
+
+    The position of the user action from where the context
+    menu request originates.
+*/
+
+/*!
+    \qmlproperty string ContextMenuRequest::selectedText
+    \readonly
+
+    The selected text the context menu was created for.
+*/
+
+/*!
+    \qmlproperty string ContextMenuRequest::linkText
+    \readonly
+
+    The text of the link if the context menu was requested for a link.
+*/
+
+/*!
+    \qmlproperty url ContextMenuRequest::linkUrl
+    \readonly
+
+    The URL of the link if the selected web page content is a link.
+    It is not guaranteed to be a valid URL.
+*/
+
+/*!
+    \qmlproperty url ContextMenuRequest::mediaUrl
+    \readonly
+
+    The URL of media if the selected web content is a media element.
+*/
+
+/*!
+    \qmlproperty enumeration ContextMenuRequest::mediaType
+    \readonly
+
+    The type of the media element or \c MediaTypeNone if
+    the selected web page content is not a media element.
+
+    \value  ContextMenuRequest.MediaTypeNone
+            Not a media.
+    \value  ContextMenuRequest.MediaTypeImage
+            An image.
+    \value  ContextMenuRequest.MediaTypeVideo
+            A video.
+    \value  ContextMenuRequest.MediaTypeAudio
+            An audio element.
+    \value  ContextMenuRequest.MediaTypeCanvas
+            A canvas.
+    \value  ContextMenuRequest.MediaTypeFile
+            A file.
+    \value  ContextMenuRequest.MediaTypePlugin
+            A plugin.
+*/
+
+/*!
+    \qmlproperty bool ContextMenuRequest::isContentEditable
+    \readonly
+
+    Indicates whether the selected web content is editable.
+*/
+
+/*!
+    \qmlproperty string ContextMenuRequest::misspelledWord
+    \readonly
+
+    If the context is a word considered misspelled by the spell-checker,
+    returns the misspelled word.
+*/
+
+/*!
+    \qmlproperty stringlist ContextMenuRequest::spellCheckerSuggestions
+    \readonly
+
+    If the context is a word considered misspelled by the spell-checker,
+    returns a list of suggested replacements.
+*/
+
+/*!
+    \qmlproperty bool ContextMenuRequest::accepted
+
+    Indicates whether the context menu request has been
+    handled by the signal handler.
+
+    If the property is \c false after any signal handlers
+    for WebEngineView::contextMenuRequested have been executed,
+    a default context menu will be shown.
+    To prevent this, set \c{request.accepted} to \c true.
+
+    The default is \c false.
+
+    \note The default content of the context menu depends on the
+    web element for which the request was actually generated.
+*/
+
+/*!
+    \qmlproperty flags ContextMenuRequest::mediaFlags
+    \readonly
+    \since QtWebEngine 1.7
+
+    The current media element's status and its available operations.
+    \c MediaNone if the selected web page content is not a media element.
+
+    \value  ContextMenuRequest.MediaInError
+            An error occurred.
+    \value  ContextMenuRequest.MediaPaused
+            Media is paused.
+    \value  ContextMenuRequest.MediaMuted
+            Media is muted.
+    \value  ContextMenuRequest.MediaLoop
+            Media can be looped.
+    \value  ContextMenuRequest.MediaCanSave
+            Media can be saved.
+    \value  ContextMenuRequest.MediaHasAudio
+            Media has audio.
+    \value  ContextMenuRequest.MediaCanToggleControls
+            Media can show controls.
+    \value  ContextMenuRequest.MediaControls
+            Media controls are shown.
+    \value  ContextMenuRequest.MediaCanPrint
+            Media is printable.
+    \value  ContextMenuRequest.MediaCanRotate
+            Media is rotatable.
+*/
+
+/*!
+    \qmlproperty flags ContextMenuRequest::editFlags
+    \readonly
+    \since QtWebEngine 1.7
+
+    The available edit operations in the current context or \c CanDoNone if no actions are available.
+
+    \value  ContextMenuRequest.CanUndo
+            Undo is available.
+    \value  ContextMenuRequest.CanRedo
+            Redo is available.
+    \value  ContextMenuRequest.CanCut
+            Cut is available.
+    \value  ContextMenuRequest.CanCopy
+            Copy is available.
+    \value  ContextMenuRequest.CanPaste
+            Paste is available.
+    \value  ContextMenuRequest.CanDelete
+            Delete is available.
+    \value  ContextMenuRequest.CanSelectAll
+            Select All is available.
+    \value  ContextMenuRequest.CanTranslate
+            Translate is available.
+    \value  ContextMenuRequest.CanEditRichly
+            Context is richly editable.
+*/
diff --git a/src/webengine/module.pro b/src/webengine/module.pro
index 49a1086b2..56bfce48f 100644
--- a/src/webengine/module.pro
+++ b/src/webengine/module.pro
@@ -1,5 +1,5 @@
 include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri)
-QT_FOR_CONFIG += webengine-private
+QT_FOR_CONFIG += webengine-private webenginecore-private
 
 TARGET = QtWebEngine
 MODULE = webengine
@@ -18,7 +18,6 @@ SOURCES = \
         api/qquickwebengineaction.cpp \
         api/qquickwebenginecertificateerror.cpp \
         api/qquickwebengineclientcertificateselection.cpp \
-        api/qquickwebenginecontextmenurequest.cpp \
         api/qquickwebenginedialogrequests.cpp \
         api/qquickwebenginedownloaditem.cpp \
         api/qquickwebenginehistory.cpp \
@@ -44,7 +43,6 @@ HEADERS = \
         api/qquickwebengineaction_p_p.h \
         api/qquickwebenginecertificateerror_p.h \
         api/qquickwebengineclientcertificateselection_p.h \
-        api/qquickwebenginecontextmenurequest_p.h \
         api/qquickwebenginedialogrequests_p.h \
         api/qquickwebenginedownloaditem_p.h \
         api/qquickwebenginedownloaditem_p_p.h \
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index a74373b23..2603e91ef 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -42,7 +42,6 @@
 
 #include <QtWebEngine/private/qquickwebenginecertificateerror_p.h>
 #include <QtWebEngine/private/qquickwebengineclientcertificateselection_p.h>
-#include <QtWebEngine/private/qquickwebenginecontextmenurequest_p.h>
 #include <QtWebEngine/private/qquickwebenginedialogrequests_p.h>
 #include <QtWebEngine/private/qquickwebenginedownloaditem_p.h>
 #include <QtWebEngine/private/qquickwebenginehistory_p.h>
@@ -59,6 +58,7 @@
 #include <QtWebEngineCore/qwebenginenotification.h>
 #include <QtWebEngineCore/qwebenginequotarequest.h>
 #include <QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h>
+#include <QtWebEngineCore/qwebenginecontextmenurequest.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -144,10 +144,8 @@ public:
         qmlRegisterUncreatableType<QQuickWebEngineFullScreenRequest>(uri, 1, 1, "FullScreenRequest",
             msgUncreatableType("FullScreenRequest"));
 
-        qmlRegisterUncreatableType<QQuickWebEngineContextMenuRequest>(uri, 1, 4, "ContextMenuRequest",
-                                                                    msgUncreatableType("ContextMenuRequest"));
-        qmlRegisterUncreatableType<QQuickWebEngineContextMenuRequest, 1>(uri, 1, 7, "ContextMenuRequest",
-                                                                    msgUncreatableType("ContextMenuRequest"));
+        qmlRegisterUncreatableType<QWebEngineContextMenuRequest, 1>(
+                uri, 1, 7, "ContextMenuRequest", msgUncreatableType("ContextMenuRequest"));
         qmlRegisterUncreatableType<QQuickWebEngineAuthenticationDialogRequest>(uri, 1, 4, "AuthenticationDialogRequest",
                                                                        msgUncreatableType("AuthenticationDialogRequest"));
         qmlRegisterUncreatableType<QQuickWebEngineJavaScriptDialogRequest>(uri, 1, 4, "JavaScriptDialogRequest",