Implement missing WebActions in QML API

Implements the remaining WebActions from the widgets API in the QML
API, so the available actions matches.

Change-Id: I60dfd4a574b80cdd82b8891abfb27a8bfb1b88ec
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

7 files changed, 174 insertions, 65 deletions

diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
index 36c5e44e1..dd197dfe4 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
@@ -90,7 +90,7 @@ bool QQuickWebEngineNewViewRequest::isUserInitiated() const
   */
 void QQuickWebEngineNewViewRequest::openIn(QQuickWebEngineView *view)
 {
-    if (!m_adapter) {
+    if (!m_adapter && !m_requestedUrl.isValid()) {
         qWarning("Trying to open an empty request, it was either already used or was invalidated."
             "\nYou must complete the request synchronously within the newViewRequested signal handler."
             " If a view hasn't been adopted before returning, the request will be invalidated.");
@@ -101,6 +101,9 @@ void QQuickWebEngineNewViewRequest::openIn(QQuickWebEngineView *view)
         qWarning("Trying to open a WebEngineNewViewRequest in an invalid WebEngineView.");
         return;
     }
-    view->d_func()->adoptWebContents(m_adapter.data());
+    if (m_adapter)
+        view->d_func()->adoptWebContents(m_adapter.data());
+    else
+        view->setUrl(m_requestedUrl);
     m_adapter.reset();
 }
diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h
index 062a2fa33..9c82f46d6 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
+++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h
@@ -62,6 +62,8 @@ private:
     QQuickWebEngineView::NewViewDestination m_destination;
     bool m_isUserInitiated;
     QExplicitlySharedDataPointer<QtWebEngineCore::WebContentsAdapter> m_adapter;
+    QUrl m_requestedUrl;
+    friend class QQuickWebEngineView;
     friend class QQuickWebEngineViewPrivate;
 };
 
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index a90de3744..4ee19da53 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -64,7 +64,9 @@
 #include "web_engine_settings.h"
 #include "web_engine_visited_links_manager.h"
 
+#include <QClipboard>
 #include <QGuiApplication>
+#include <QMimeData>
 #include <QQmlComponent>
 #include <QQmlContext>
 #include <QQmlEngine>
@@ -177,12 +179,15 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
     if (!menu)
         return false;
 
+    contextMenuData = data;
+
     // Populate our menu
     MenuItemHandler *item = 0;
 
     if (!data.linkText.isEmpty() && data.linkUrl.isValid()) {
-        item = new NavigateMenuItem(menu, adapter, data.linkUrl);
-        ui()->addMenuItem(item, QObject::tr("Follow link"));
+        item = new MenuItemHandler(menu);
+        QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::OpenLinkInThisWindow); });
+        ui()->addMenuItem(item, QObject::tr("Follow Link"));
     }
 
     if (data.selectedText.isEmpty()) {
@@ -200,12 +205,51 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
     } else {
         item = new MenuItemHandler(menu);
         QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::Copy); });
-        ui()->addMenuItem(item, QObject::tr("Copy..."));
+        ui()->addMenuItem(item, QObject::tr("Copy"));
     }
 
-    if (!data.linkText.isEmpty() && data.linkUrl.isValid()) {
-        item = new CopyLinkMenuItem(menu, data.linkUrl, data.linkText);
-        ui()->addMenuItem(item, QObject::tr("Copy link address"));
+    if (!contextMenuData.linkText.isEmpty() && contextMenuData.linkUrl.isValid()) {
+        item = new MenuItemHandler(menu);
+        QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::CopyLinkToClipboard); });
+        ui()->addMenuItem(item, QObject::tr("Copy Link URL"));
+    }
+    if (contextMenuData.mediaUrl.isValid()) {
+        switch (contextMenuData.mediaType) {
+        case WebEngineContextMenuData::MediaTypeImage:
+            item = new MenuItemHandler(menu);
+            QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::CopyImageUrlToClipboard); });
+            ui()->addMenuItem(item, QObject::tr("Copy Image URL"));
+            // no break
+        case WebEngineContextMenuData::MediaTypeCanvas:
+            item = new MenuItemHandler(menu);
+            QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::CopyImageToClipboard); });
+            ui()->addMenuItem(item, QObject::tr("Copy Image"));
+            break;
+        case WebEngineContextMenuData::MediaTypeAudio:
+        case WebEngineContextMenuData::MediaTypeVideo:
+            item = new MenuItemHandler(menu);
+            QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::CopyMediaUrlToClipboard); });
+            ui()->addMenuItem(item, QObject::tr("Copy Media URL"));
+            item = new MenuItemHandler(menu);
+            QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::ToggleMediaPlayPause); });
+            ui()->addMenuItem(item, QObject::tr("Toggle Play/Pause"));
+            item = new MenuItemHandler(menu);
+            QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::ToggleMediaLoop); });
+            ui()->addMenuItem(item, QObject::tr("Toggle Looping"));
+            if (contextMenuData.mediaFlags & WebEngineContextMenuData::MediaHasAudio) {
+                item = new MenuItemHandler(menu);
+                QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::ToggleMediaMute); });
+                ui()->addMenuItem(item, QObject::tr("Toggle Mute"));
+            }
+            if (contextMenuData.mediaFlags & WebEngineContextMenuData::MediaCanToggleControls) {
+                item = new MenuItemHandler(menu);
+                QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::ToggleMediaControls); });
+                ui()->addMenuItem(item, QObject::tr("Toggle Media Controls"));
+            }
+            break;
+        default:
+            break;
+        }
     }
 
     // FIXME: expose the context menu data as an attached property to make this more useful
@@ -1081,6 +1125,108 @@ void QQuickWebEngineView::triggerWebAction(WebAction action)
     case PasteAndMatchStyle:
         d->adapter->pasteAndMatchStyle();
         break;
+    case OpenLinkInThisWindow:
+        if (d->contextMenuData.linkUrl.isValid())
+            setUrl(d->contextMenuData.linkUrl);
+        break;
+    case OpenLinkInNewWindow:
+        if (d->contextMenuData.linkUrl.isValid()) {
+            QQuickWebEngineNewViewRequest request;
+            request.m_requestedUrl = d->contextMenuData.linkUrl;
+            request.m_isUserInitiated = true;
+            request.m_destination = NewViewInWindow;
+            Q_EMIT newViewRequested(&request);
+        }
+        break;
+    case OpenLinkInNewTab:
+        if (d->contextMenuData.linkUrl.isValid()) {
+            QQuickWebEngineNewViewRequest request;
+            request.m_requestedUrl = d->contextMenuData.linkUrl;
+            request.m_isUserInitiated = true;
+            request.m_destination = NewViewInBackgroundTab;
+            Q_EMIT newViewRequested(&request);
+        }
+        break;
+    case CopyLinkToClipboard:
+        if (d->contextMenuData.linkUrl.isValid()) {
+            QString urlString = d->contextMenuData.linkUrl.toString(QUrl::FullyEncoded);
+            QString title = d->contextMenuData.linkText.toHtmlEscaped();
+            QMimeData *data = new QMimeData();
+            data->setText(urlString);
+            QString html = QStringLiteral("<a href=\"") + urlString + QStringLiteral("\">") + title + QStringLiteral("</a>");
+            data->setHtml(html);
+            data->setUrls(QList<QUrl>() << d->contextMenuData.linkUrl);
+            qApp->clipboard()->setMimeData(data);
+        }
+        break;
+    case CopyImageToClipboard:
+        if (d->contextMenuData.hasImageContent &&
+                (d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeImage ||
+                 d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeCanvas))
+        {
+            d->adapter->copyImageAt(d->contextMenuData.pos);
+        }
+        break;
+    case CopyImageUrlToClipboard:
+        if (d->contextMenuData.mediaUrl.isValid() && d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeImage) {
+            QString urlString = d->contextMenuData.mediaUrl.toString(QUrl::FullyEncoded);
+            QString title = d->contextMenuData.linkText;
+            if (!title.isEmpty())
+                title = QStringLiteral(" alt=\"%1\"").arg(title.toHtmlEscaped());
+            QMimeData *data = new QMimeData();
+            data->setText(urlString);
+            QString html = QStringLiteral("<img src=\"") + urlString + QStringLiteral("\"") + title + QStringLiteral("></img>");
+            data->setHtml(html);
+            data->setUrls(QList<QUrl>() << d->contextMenuData.mediaUrl);
+            qApp->clipboard()->setMimeData(data);
+        }
+        break;
+    case CopyMediaUrlToClipboard:
+        if (d->contextMenuData.mediaUrl.isValid() &&
+                (d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeAudio ||
+                 d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeVideo))
+        {
+            QString urlString = d->contextMenuData.mediaUrl.toString(QUrl::FullyEncoded);
+            QMimeData *data = new QMimeData();
+            data->setText(urlString);
+            if (d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeAudio)
+                data->setHtml(QStringLiteral("<audio src=\"") + urlString + QStringLiteral("\"></audio>"));
+            else
+                data->setHtml(QStringLiteral("<video src=\"") + urlString + QStringLiteral("\"></video>"));
+            data->setUrls(QList<QUrl>() << d->contextMenuData.mediaUrl);
+            qApp->clipboard()->setMimeData(data);
+        }
+        break;
+    case ToggleMediaControls:
+        if (d->contextMenuData.mediaUrl.isValid() && d->contextMenuData.mediaFlags & WebEngineContextMenuData::MediaCanToggleControls) {
+            bool enable = !(d->contextMenuData.mediaFlags & WebEngineContextMenuData::MediaControls);
+            d->adapter->executeMediaPlayerActionAt(d->contextMenuData.pos, WebContentsAdapter::MediaPlayerControls, enable);
+        }
+        break;
+    case ToggleMediaLoop:
+        if (d->contextMenuData.mediaUrl.isValid() &&
+                (d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeAudio ||
+                 d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeVideo))
+        {
+            bool enable = !(d->contextMenuData.mediaFlags & WebEngineContextMenuData::MediaLoop);
+            d->adapter->executeMediaPlayerActionAt(d->contextMenuData.pos, WebContentsAdapter::MediaPlayerLoop, enable);
+        }
+        break;
+    case ToggleMediaPlayPause:
+        if (d->contextMenuData.mediaUrl.isValid() &&
+                (d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeAudio ||
+                 d->contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeVideo))
+        {
+            bool enable = (d->contextMenuData.mediaFlags & WebEngineContextMenuData::MediaPaused);
+            d->adapter->executeMediaPlayerActionAt(d->contextMenuData.pos, WebContentsAdapter::MediaPlayerPlay, enable);
+        }
+        break;
+    case ToggleMediaMute:
+        if (d->contextMenuData.mediaUrl.isValid() && d->contextMenuData.mediaFlags & WebEngineContextMenuData::MediaHasAudio) {
+            bool enable = (d->contextMenuData.mediaFlags & WebEngineContextMenuData::MediaMuted);
+            d->adapter->executeMediaPlayerActionAt(d->contextMenuData.pos, WebContentsAdapter::MediaPlayerMute, enable);
+        }
+        break;
     default:
         Q_UNREACHABLE();
     }
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 95a9b2a2e..5db15e873 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -192,6 +192,20 @@ public:
 
         PasteAndMatchStyle,
 
+        OpenLinkInThisWindow,
+        OpenLinkInNewWindow,
+        OpenLinkInNewTab,
+        CopyLinkToClipboard,
+
+        CopyImageToClipboard,
+        CopyImageUrlToClipboard,
+
+        CopyMediaUrlToClipboard,
+        ToggleMediaControls,
+        ToggleMediaLoop,
+        ToggleMediaPlayPause,
+        ToggleMediaMute,
+
         WebActionCount
     };
 
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index ad0e937a0..7e411d349 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -179,6 +179,7 @@ public:
     QQuickWebEngineTestSupport *m_testSupport;
 #endif
     QQmlComponent *contextMenuExtraItems;
+    QtWebEngineCore::WebEngineContextMenuData contextMenuData;
     QUrl explicitUrl;
     QUrl icon;
     int loadProgress;
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 6eeff7db5..bacf48419 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -109,39 +109,6 @@ MenuItemHandler::MenuItemHandler(QObject *parent)
 {
 }
 
-CopyLinkMenuItem::CopyLinkMenuItem(QObject *parent, const QUrl &url, const QString &title)
-    : MenuItemHandler(parent)
-    , m_url(url)
-    , m_title(title)
-{
-    connect(this, &MenuItemHandler::triggered, this, &CopyLinkMenuItem::onTriggered);
-}
-
-void CopyLinkMenuItem::onTriggered()
-{
-    QString urlString = m_url.toString(QUrl::FullyEncoded);
-    QString title = m_title.toHtmlEscaped();
-    QMimeData *data = new QMimeData();
-    data->setText(urlString);
-    QString html = QStringLiteral("<a href=\"") + urlString + QStringLiteral("\">") + title + QStringLiteral("</a>");
-    data->setHtml(html);
-    data->setUrls(QList<QUrl>() << m_url);
-    qApp->clipboard()->setMimeData(data);
-}
-
-NavigateMenuItem::NavigateMenuItem(QObject *parent, const QExplicitlySharedDataPointer<WebContentsAdapter> &adapter, const QUrl &targetUrl)
-    : MenuItemHandler(parent)
-    , m_adapter(adapter)
-    , m_targetUrl(targetUrl)
-{
-    connect(this, &MenuItemHandler::triggered, this, &NavigateMenuItem::onTriggered);
-}
-
-void NavigateMenuItem::onTriggered()
-{
-    m_adapter->load(m_targetUrl);
-}
-
 #define COMPONENT_MEMBER_INIT(TYPE, COMPONENT) \
     , COMPONENT##Component(0)
 
diff --git a/src/webengine/ui_delegates_manager.h b/src/webengine/ui_delegates_manager.h
index 7a35e8485..37cbb85df 100644
--- a/src/webengine/ui_delegates_manager.h
+++ b/src/webengine/ui_delegates_manager.h
@@ -86,30 +86,6 @@ Q_SIGNALS:
     void triggered();
 };
 
-class CopyLinkMenuItem : public MenuItemHandler {
-    Q_OBJECT
-public:
-    CopyLinkMenuItem(QObject *parent, const QUrl &url, const QString &title);
-
-private:
-    void onTriggered();
-
-    const QUrl m_url;
-    const QString m_title;
-};
-
-class NavigateMenuItem : public MenuItemHandler {
-    Q_OBJECT
-public:
-    NavigateMenuItem(QObject *parent, const QExplicitlySharedDataPointer<WebContentsAdapter> &adapter, const QUrl &targetUrl);
-
-private:
-    void onTriggered();
-
-    QExplicitlySharedDataPointer<WebContentsAdapter> m_adapter;
-    QUrl m_targetUrl;
-};
-
 class UIDelegatesManager {
 
 public: