Fix WebChannel when JavaScript is disabled

WebChannel was not working in ApplicationWorld with JavaScript disabled
in MainWorld, because WebChannelIPCTransport::DidClearWindowObject() is
called only when the window object was cleared in the main world. Moving
the WebChannelTransport installation logic to DidCreateScriptContext()
works in other worlds, so fixes the problem.

Task-number: QTBUG-88875
Pick-to: 6.2
Change-Id: Ia75613b66a1e049f617f0664684b153b6875e9de
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
index fff3eb70f..8525c3619 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
+++ b/src/core/renderer/web_channel_ipc_transport.cpp
@@ -259,21 +259,21 @@ void WebChannelIPCTransport::DispatchWebChannelMessage(const std::vector<uint8_t
     frame->CallFunctionEvenIfScriptDisabled(callback, webChannelObject, 1, argv);
 }
 
-void WebChannelIPCTransport::WillReleaseScriptContext(v8::Local<v8::Context> context, int worldId)
-{
-    if (static_cast<uint>(worldId) == m_worldId)
-        m_canUseContext = false;
-}
-
-void WebChannelIPCTransport::DidClearWindowObject()
+void WebChannelIPCTransport::DidCreateScriptContext(v8::Local<v8::Context> context, int32_t worldId)
 {
-    if (!m_canUseContext) {
+    if (static_cast<uint>(worldId) == m_worldId && !m_canUseContext) {
         m_canUseContext = true;
         if (m_worldInitialized)
             WebChannelTransport::Install(render_frame()->GetWebFrame(), m_worldId);
     }
 }
 
+void WebChannelIPCTransport::WillReleaseScriptContext(v8::Local<v8::Context> context, int worldId)
+{
+    if (static_cast<uint>(worldId) == m_worldId)
+        m_canUseContext = false;
+}
+
 void WebChannelIPCTransport::OnDestruct()
 {
     delete this;