Add API to set WebChannel on isolated world

Make it possible to set a web-channel so that it can only be accessed
by private scripts.

Pulls in needed API extension in 3rdparty.

Task-number: QTBUG-50318
Change-Id: I61bcce5c318dffe0a406ee8cddf31f58a021c22c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/src/core/web_channel_ipc_transport_host.cpp b/src/core/web_channel_ipc_transport_host.cpp
index 800e78308..1e01c6e8e 100644
--- a/src/core/web_channel_ipc_transport_host.cpp
+++ b/src/core/web_channel_ipc_transport_host.cpp
@@ -46,23 +46,33 @@
 
 namespace QtWebEngineCore {
 
-WebChannelIPCTransportHost::WebChannelIPCTransportHost(content::WebContents *contents, QObject *parent)
+WebChannelIPCTransportHost::WebChannelIPCTransportHost(content::WebContents *contents, uint worldId, QObject *parent)
     : QWebChannelAbstractTransport(parent)
     , content::WebContentsObserver(contents)
+    , m_worldId(worldId)
 {
-    Send(new WebChannelIPCTransport_Install(routing_id()));
+    Send(new WebChannelIPCTransport_Install(routing_id(), m_worldId));
 }
 
 WebChannelIPCTransportHost::~WebChannelIPCTransportHost()
 {
 }
 
+void WebChannelIPCTransportHost::setWorldId(uint worldId)
+{
+    if (worldId == m_worldId)
+        return;
+    Send(new WebChannelIPCTransport_Uninstall(routing_id(), m_worldId));
+    m_worldId = worldId;
+    Send(new WebChannelIPCTransport_Install(routing_id(), m_worldId));
+}
+
 void WebChannelIPCTransportHost::sendMessage(const QJsonObject &message)
 {
     QJsonDocument doc(message);
     int size = 0;
     const char *rawData = doc.rawData(&size);
-    Send(new WebChannelIPCTransport_Message(routing_id(), std::vector<char>(rawData, rawData + size)));
+    Send(new WebChannelIPCTransport_Message(routing_id(), std::vector<char>(rawData, rawData + size), m_worldId));
 }
 
 void WebChannelIPCTransportHost::onWebChannelMessage(const std::vector<char> &message)