Migrate user script IPC to mojo

Use mojo instead of old IPC, keep current design and use two
interfaces one global and one per frame for now, also use
in both cases associated interface with ipc channel otherwise
script can be added during the page load, which will radomly
brake tests.

This change moves UserDataScript to chromium since mojo binding
generation did not work correctly. Use StructTraits when serializing
the class.

Change-Id: I7073fb831c96849e47864382188300db3c9137d9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 53 insertions, 22 deletions

diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp
index 6b9bb63fe..613c2917d 100644
--- a/src/core/renderer_host/user_resource_controller_host.cpp
+++ b/src/core/renderer_host/user_resource_controller_host.cpp
@@ -48,6 +48,8 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "qtwebengine/userscript/userscript.mojom.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 
 namespace QtWebEngineCore {
 
@@ -75,16 +77,26 @@ UserResourceControllerHost::WebContentsObserverHelper::WebContentsObserverHelper
 void UserResourceControllerHost::WebContentsObserverHelper::RenderFrameCreated(content::RenderFrameHost *renderFrameHost)
 {
     content::WebContents *contents = web_contents();
+    mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame>
+            userResourceController;
+    renderFrameHost->GetRemoteAssociatedInterfaces()->GetInterface(
+            userResourceController.BindNewEndpointAndPassReceiver());
+
     const QList<UserScript> scripts = m_controllerHost->m_perContentsScripts.value(contents);
     for (const UserScript &script : scripts)
-        renderFrameHost->Send(new RenderFrameObserverHelper_AddScript(renderFrameHost->GetRoutingID(), script.data()));
+        userResourceController->AddScript(script.data());
 }
 
 void UserResourceControllerHost::WebContentsObserverHelper::RenderFrameHostChanged(content::RenderFrameHost *oldHost,
                                                                                    content::RenderFrameHost *newHost)
 {
-    if (oldHost)
-        oldHost->Send(new RenderFrameObserverHelper_ClearScripts(oldHost->GetRoutingID()));
+    if (oldHost) {
+        mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame>
+                userResourceController;
+        oldHost->GetRemoteAssociatedInterfaces()->GetInterface(
+                userResourceController.BindNewEndpointAndPassReceiver());
+        userResourceController->ClearScripts();
+    }
 }
 
 void UserResourceControllerHost::WebContentsObserverHelper::WebContentsDestroyed()
@@ -111,6 +123,7 @@ UserResourceControllerHost::RenderProcessObserverHelper::RenderProcessObserverHe
 void UserResourceControllerHost::RenderProcessObserverHelper::RenderProcessHostDestroyed(content::RenderProcessHost *renderer)
 {
     Q_ASSERT(m_controllerHost);
+    delete m_controllerHost->m_observedProcesses[renderer];
     m_controllerHost->m_observedProcesses.remove(renderer);
 }
 
@@ -123,8 +136,8 @@ void UserResourceControllerHost::addUserScript(const UserScript &script, WebCont
     if (isProfileWideScript) {
         if (!m_profileWideScripts.contains(script)) {
             m_profileWideScripts.append(script);
-            for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses))
-                renderer->Send(new UserResourceController_AddScript(script.data()));
+            for (auto controller : m_observedProcesses.values())
+                (*controller)->AddScript(script.data());
         }
     } else {
         content::WebContents *contents = adapter->webContents();
@@ -141,10 +154,13 @@ void UserResourceControllerHost::addUserScript(const UserScript &script, WebCont
                 m_perContentsScripts.insert(contents, currentScripts);
             }
         }
-        contents->GetRenderViewHost()->Send(
-                new RenderFrameObserverHelper_AddScript(
-                    contents->GetRenderViewHost()->GetMainFrame()->GetRoutingID(),
-                    script.data()));
+        mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame>
+                userResourceController;
+        contents->GetRenderViewHost()
+                ->GetMainFrame()
+                ->GetRemoteAssociatedInterfaces()
+                ->GetInterface(userResourceController.BindNewEndpointAndPassReceiver());
+        userResourceController->AddScript(script.data());
     }
 }
 
@@ -157,8 +173,8 @@ bool UserResourceControllerHost::removeUserScript(const UserScript &script, WebC
         QList<UserScript>::iterator it = std::find(m_profileWideScripts.begin(), m_profileWideScripts.end(), script);
         if (it == m_profileWideScripts.end())
             return false;
-        for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses))
-            renderer->Send(new UserResourceController_RemoveScript((*it).data()));
+        for (auto controller : m_observedProcesses.values())
+            (*controller)->RemoveScript((*it).data());
         m_profileWideScripts.erase(it);
     } else {
         content::WebContents *contents = adapter->webContents();
@@ -168,8 +184,13 @@ bool UserResourceControllerHost::removeUserScript(const UserScript &script, WebC
         QList<UserScript>::iterator it = std::find(list.begin(), list.end(), script);
         if (it == list.end())
             return false;
-        contents->GetRenderViewHost()->Send(
-                new RenderFrameObserverHelper_RemoveScript(contents->GetMainFrame()->GetRoutingID(), (*it).data()));
+        mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame>
+                userResourceController;
+        contents->GetRenderViewHost()
+                ->GetMainFrame()
+                ->GetRemoteAssociatedInterfaces()
+                ->GetInterface(userResourceController.BindNewEndpointAndPassReceiver());
+        userResourceController->RemoveScript((*it).data());
         list.erase(it);
     }
     return true;
@@ -180,13 +201,18 @@ void UserResourceControllerHost::clearAllScripts(WebContentsAdapter *adapter)
     const bool isProfileWideScript = !adapter;
     if (isProfileWideScript) {
         m_profileWideScripts.clear();
-        for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses))
-            renderer->Send(new UserResourceController_ClearScripts);
+        for (auto controller : m_observedProcesses.values())
+            (*controller)->ClearScripts();
     } else {
         content::WebContents *contents = adapter->webContents();
         m_perContentsScripts.remove(contents);
-        contents->GetRenderViewHost()->Send(
-                new RenderFrameObserverHelper_ClearScripts(contents->GetMainFrame()->GetRoutingID()));
+        mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame>
+                userResourceController;
+        contents->GetRenderViewHost()
+                ->GetMainFrame()
+                ->GetRemoteAssociatedInterfaces()
+                ->GetInterface(userResourceController.BindNewEndpointAndPassReceiver());
+        userResourceController->ClearScripts();
     }
 }
 
@@ -201,15 +227,18 @@ void UserResourceControllerHost::reserve(WebContentsAdapter *adapter, int count)
 
 void UserResourceControllerHost::renderProcessStartedWithHost(content::RenderProcessHost *renderer)
 {
-    if (m_observedProcesses.contains(renderer))
+    if (m_observedProcesses.keys().contains(renderer))
         return;
 
     if (m_renderProcessObserver.isNull())
         m_renderProcessObserver.reset(new RenderProcessObserverHelper(this));
     renderer->AddObserver(m_renderProcessObserver.data());
-    m_observedProcesses.insert(renderer);
-    for (const UserScript &script : qAsConst(m_profileWideScripts))
-        renderer->Send(new UserResourceController_AddScript(script.data()));
+    auto userResourceController = new UserResourceControllerRemote;
+    renderer->GetChannel()->GetRemoteAssociatedInterface(userResourceController);
+    m_observedProcesses.insert(renderer, userResourceController);
+    for (const UserScript &script : qAsConst(m_profileWideScripts)) {
+        (*userResourceController)->AddScript(script.data());
+    }
 }
 
 void UserResourceControllerHost::webContentsDestroyed(content::WebContents *contents)
@@ -223,8 +252,10 @@ UserResourceControllerHost::UserResourceControllerHost()
 
 UserResourceControllerHost::~UserResourceControllerHost()
 {
-    for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses))
+    for (content::RenderProcessHost *renderer : m_observedProcesses.keys()) {
         renderer->RemoveObserver(m_renderProcessObserver.data());
+        delete m_observedProcesses[renderer];
+    }
 }
 
 } // namespace