Cache mojo interface bindings for WebChannelIPCTransport

Change-Id: Ica6b794e16aecc60dc2c39d31750acc6b25410df
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

Author: Michal Klocek

src/core/renderer/web_channel_ipc_transport.cpp

@@ -74,7 +74,8 @@ class WebChannelTransport : public gin::Wrappable<WebChannelTransport>
 
     // gin::WrappableBase
     gin::ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate *isolate) override;
-
+    mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportHost> m_remote;
+    content::RenderFrame *m_renderFrame = nullptr;
     DISALLOW_COPY_AND_ASSIGN(WebChannelTransport);
 };
 
@@ -165,9 +166,14 @@ void WebChannelTransport::NativeQtSendMessage(gin::Arguments *args)
 
     int size = 0;
     const char *rawData = doc.rawData(&size);
-    mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportHost> webChannelTransport;
-    renderFrame->GetRemoteAssociatedInterfaces()->GetInterface(&webChannelTransport);
-    webChannelTransport->DispatchWebChannelMessage(std::vector<uint8_t>(rawData, rawData + size));
+
+    if (!m_remote) {
+        renderFrame->GetRemoteAssociatedInterfaces()->GetInterface(&m_remote);
+        m_renderFrame = renderFrame;
+    }
+    DCHECK(renderFrame == m_renderFrame);
+
+    m_remote->DispatchWebChannelMessage(std::vector<uint8_t>(rawData, rawData + size));
 }
 
 gin::ObjectTemplateBuilder WebChannelTransport::GetObjectTemplateBuilder(v8::Isolate *isolate)
@@ -177,7 +183,10 @@ gin::ObjectTemplateBuilder WebChannelTransport::GetObjectTemplateBuilder(v8::Iso
 }
 
 WebChannelIPCTransport::WebChannelIPCTransport(content::RenderFrame *renderFrame)
-    : content::RenderFrameObserver(renderFrame), m_worldId(0), m_worldInitialized(false)
+    : content::RenderFrameObserver(renderFrame)
+    , m_worldId(0)
+    , m_worldInitialized(false)
+    , m_binding(this)
 {
     renderFrame->GetAssociatedInterfaceRegistry()->AddInterface(
             base::BindRepeating(&WebChannelIPCTransport::BindReceiver, base::Unretained(this)));
@@ -186,7 +195,7 @@ WebChannelIPCTransport::WebChannelIPCTransport(content::RenderFrame *renderFrame
 void WebChannelIPCTransport::BindReceiver(
         mojo::PendingAssociatedReceiver<qtwebchannel::mojom::WebChannelTransportRender> receiver)
 {
-    m_receivers.Add(this, std::move(receiver));
+    m_binding.Bind(std::move(receiver));
 }
 
 void WebChannelIPCTransport::SetWorldId(uint32_t worldId)

src/core/renderer/web_channel_ipc_transport.h

@@ -76,7 +76,7 @@ class WebChannelIPCTransport
     bool m_worldInitialized;
     // True means it's currently OK to manipulate the frame's script context.
     bool m_canUseContext = false;
-    mojo::AssociatedReceiverSet<qtwebchannel::mojom::WebChannelTransportRender> m_receivers;
+    mojo::AssociatedReceiver<qtwebchannel::mojom::WebChannelTransportRender> m_binding;
 };
 
 } // namespace

src/core/renderer_host/web_channel_ipc_transport_host.cpp

@@ -96,10 +96,9 @@ void WebChannelIPCTransportHost::sendMessage(const QJsonObject &message)
     int size = 0;
     const char *rawData = doc.rawData(&size);
     content::RenderFrameHost *frame = web_contents()->GetMainFrame();
-    mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender> webChannelTransport;
-    frame->GetRemoteAssociatedInterfaces()->GetInterface(&webChannelTransport);
     qCDebug(log).nospace() << "sending webchannel message to " << frame << ": " << doc;
-    webChannelTransport->DispatchWebChannelMessage(std::vector<uint8_t>(rawData, rawData + size), m_worldId);
+    GetWebChannelIPCTransportRemote(frame)->DispatchWebChannelMessage(
+            std::vector<uint8_t>(rawData, rawData + size), m_worldId);
 }
 
 void WebChannelIPCTransportHost::setWorldId(uint32_t worldId)
@@ -116,19 +115,15 @@ void WebChannelIPCTransportHost::setWorldId(content::RenderFrameHost *frame, uin
     if (!frame->IsRenderFrameLive())
         return;
     qCDebug(log).nospace() << "sending setWorldId(" << worldId << ") message to " << frame;
-    mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender> webChannelTransport;
-    frame->GetRemoteAssociatedInterfaces()->GetInterface(&webChannelTransport);
-    webChannelTransport->SetWorldId(worldId);
+    GetWebChannelIPCTransportRemote(frame)->SetWorldId(worldId);
 }
 
 void WebChannelIPCTransportHost::resetWorldId()
 {
     for (content::RenderFrameHost *frame : web_contents()->GetAllFrames()) {
         if (!frame->IsRenderFrameLive())
             return;
-        mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender> webChannelTransport;
-        frame->GetRemoteAssociatedInterfaces()->GetInterface(&webChannelTransport);
-        webChannelTransport->ResetWorldId();
+        GetWebChannelIPCTransportRemote(frame)->ResetWorldId();
     }
 }
 
@@ -156,4 +151,25 @@ void WebChannelIPCTransportHost::RenderFrameCreated(content::RenderFrameHost *fr
     setWorldId(frame, m_worldId);
 }
 
+void WebChannelIPCTransportHost::RenderFrameDeleted(content::RenderFrameHost *rfh)
+{
+    m_renderFrames.erase(rfh);
+}
+
+const mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender> &
+WebChannelIPCTransportHost::GetWebChannelIPCTransportRemote(content::RenderFrameHost *rfh)
+{
+    auto it = m_renderFrames.find(rfh);
+    if (it == m_renderFrames.end()) {
+        mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender> remote;
+        rfh->GetRemoteAssociatedInterfaces()->GetInterface(remote.BindNewEndpointAndPassReceiver());
+        it = m_renderFrames.insert(std::make_pair(rfh, std::move(remote))).first;
+    } else if (it->second.is_bound() && !it->second.is_connected()) {
+        it->second.reset();
+        rfh->GetRemoteAssociatedInterfaces()->GetInterface(&it->second);
+    }
+
+    return it->second;
+}
+
 } // namespace QtWebEngineCore

src/core/renderer_host/web_channel_ipc_transport_host.h

@@ -47,6 +47,7 @@
 #include "qtwebengine/browser/qtwebchannel.mojom.h"
 
 #include <QWebChannelAbstractTransport>
+#include <map>
 
 QT_FORWARD_DECLARE_CLASS(QString)
 
@@ -72,8 +73,12 @@ class WebChannelIPCTransportHost
     void resetWorldId();
     void onWebChannelMessage(const std::vector<char> &message);
 
+    const mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender> &
+    GetWebChannelIPCTransportRemote(content::RenderFrameHost *rfh);
+
     // WebContentsObserver
     void RenderFrameCreated(content::RenderFrameHost *frame) override;
+    void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) override;
 
     // qtwebchannel::mojom::WebChannelTransportHost
     void DispatchWebChannelMessage(const std::vector<uint8_t> &binaryJson) override;
@@ -82,6 +87,9 @@ class WebChannelIPCTransportHost
     // WebChannelIPCTransports/RenderFrames in the observed WebContents.
     uint32_t m_worldId;
     content::WebContentsFrameReceiverSet<qtwebchannel::mojom::WebChannelTransportHost> m_receiver;
+    std::map<content::RenderFrameHost *,
+             mojo::AssociatedRemote<qtwebchannel::mojom::WebChannelTransportRender>>
+            m_renderFrames;
 };
 
 } // namespace