Adaptations for Chromium 60

Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

9 files changed, 114 insertions, 41 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index a3b0fece8..ab8e27939 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -57,6 +57,9 @@
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "components/web_cache/renderer/web_cache_impl.h"
 #include "content/public/renderer/render_frame.h"
+#include "content/public/child/child_thread.h"
+#include "content/public/common/service_manager_connection.h"
+#include "content/public/common/simple_connection_filter.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "net/base/net_errors.h"
@@ -75,7 +78,7 @@
 #include "renderer/render_view_observer_qt.h"
 #include "renderer/user_resource_controller.h"
 #include "renderer/web_channel_ipc_transport.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 
 #include "components/grit/components_resources.h"
 
@@ -98,8 +101,16 @@ void ContentRendererClientQt::RenderThreadStarted()
     content::RenderThread *renderThread = content::RenderThread::Get();
     m_visitedLinkSlave.reset(new visitedlink::VisitedLinkSlave);
     m_webCacheImpl.reset(new web_cache::WebCacheImpl());
-    renderThread->GetInterfaceRegistry()->AddInterface(
-        m_visitedLinkSlave->GetBindCallback());
+
+    auto registry = base::MakeUnique<service_manager::BinderRegistry>();
+    registry->AddInterface(m_visitedLinkSlave->GetBindCallback(),
+                           base::ThreadTaskRunnerHandle::Get());
+    content::ChildThread::Get()
+        ->GetServiceManagerConnection()
+        ->AddConnectionFilter(base::MakeUnique<content::SimpleConnectionFilter>(
+            std::move(registry)));
+
+
     renderThread->AddObserver(UserResourceController::instance());
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -119,6 +130,8 @@ void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view
 void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame* render_frame)
 {
     new QtWebEngineCore::RenderFrameObserverQt(render_frame);
+    UserResourceController::instance()->renderFrameCreated(render_frame);
+
 #if BUILDFLAG(ENABLE_SPELLCHECK)
     new SpellCheckProvider(render_frame, m_spellCheck.data());
 #endif
diff --git a/src/core/renderer/render_frame_observer_qt.cpp b/src/core/renderer/render_frame_observer_qt.cpp
index 111323b8a..7e6d11644 100644
--- a/src/core/renderer/render_frame_observer_qt.cpp
+++ b/src/core/renderer/render_frame_observer_qt.cpp
@@ -64,6 +64,10 @@ RenderFrameObserverQt::~RenderFrameObserverQt()
 {
 }
 
+void RenderFrameObserverQt::OnDestruct() {
+    delete this;
+}
+
 #if BUILDFLAG(ENABLE_PLUGINS)
 void RenderFrameObserverQt::DidCreatePepperPlugin(content::RendererPpapiHost* host)
 {
diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h
index 7abd17e96..ac098a961 100644
--- a/src/core/renderer/render_frame_observer_qt.h
+++ b/src/core/renderer/render_frame_observer_qt.h
@@ -63,7 +63,7 @@ public:
 #if BUILDFLAG(ENABLE_PLUGINS)
     void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
 #endif
-    void OnDestruct() override { }
+    void OnDestruct() override;
     void FrameDetached() override;
 
     bool isFrameDetached() const;
diff --git a/src/core/renderer/render_view_observer_qt.cpp b/src/core/renderer/render_view_observer_qt.cpp
index 676210688..4893a5188 100644
--- a/src/core/renderer/render_view_observer_qt.cpp
+++ b/src/core/renderer/render_view_observer_qt.cpp
@@ -83,6 +83,11 @@ void RenderViewObserverQt::onSetBackgroundColor(quint32 color)
     render_view()->GetWebFrameWidget()->SetBaseBackgroundColor(color);
 }
 
+void RenderViewObserverQt::OnDestruct()
+{
+    delete this;
+}
+
 bool RenderViewObserverQt::OnMessageReceived(const IPC::Message& message)
 {
     bool handled = true;
diff --git a/src/core/renderer/render_view_observer_qt.h b/src/core/renderer/render_view_observer_qt.h
index 60b11c428..abb472f02 100644
--- a/src/core/renderer/render_view_observer_qt.h
+++ b/src/core/renderer/render_view_observer_qt.h
@@ -57,7 +57,7 @@ private:
     void onFetchDocumentInnerText(quint64 requestId);
     void onSetBackgroundColor(quint32 color);
 
-    void OnDestruct() override { }
+    void OnDestruct() override;
 
     bool OnMessageReceived(const IPC::Message& message) override;
     void Navigate(const GURL& url) override;
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index d2e70a226..d479c559b 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -43,6 +43,7 @@
 #include "base/strings/pattern.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
+#include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "extensions/common/url_pattern.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -97,16 +98,16 @@ static bool scriptMatchesURL(const UserScriptData &scriptData, const GURL &url)
     return true;
 }
 
-class UserResourceController::RenderViewObserverHelper : public content::RenderViewObserver
+class UserResourceController::RenderFrameObserverHelper : public content::RenderFrameObserver
 {
 public:
-    RenderViewObserverHelper(content::RenderView *);
+    RenderFrameObserverHelper(content::RenderFrame* render_frame);
 private:
-    // RenderViewObserver implementation.
-    void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
-    void DidFinishLoad(blink::WebLocalFrame* frame) override;
-    void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
-    void FrameDetached(blink::WebFrame* frame) override;
+    // RenderFrameObserver implementation.
+    void DidFinishDocumentLoad() override;
+    void DidFinishLoad() override;
+    void DidStartProvisionalLoad(blink::WebDataSource* data_source) override;
+    void FrameDetached() override;
     void OnDestruct() override;
     bool OnMessageReceived(const IPC::Message& message) override;
 
@@ -115,10 +116,23 @@ private:
     void onScriptsCleared();
 
     void runScripts(UserScriptData::InjectionPoint, blink::WebLocalFrame *);
+
+    // Set of frames which are pending to get an AfterLoad invocation of runScripts, if they
+    // haven't gotten it already.
     QSet<blink::WebLocalFrame *> m_pendingFrames;
 };
 
-void UserResourceController::RenderViewObserverHelper::runScripts(UserScriptData::InjectionPoint p, blink::WebLocalFrame *frame)
+// Used only for script cleanup on RenderView destruction.
+class UserResourceController::RenderViewObserverHelper : public content::RenderViewObserver
+{
+public:
+    RenderViewObserverHelper(content::RenderView* render_view);
+private:
+    // RenderViewObserver implementation.
+    void OnDestruct() override;
+};
+
+void UserResourceController::RenderFrameObserverHelper::runScripts(UserScriptData::InjectionPoint p, blink::WebLocalFrame *frame)
 {
     if (p == UserScriptData::AfterLoad && !m_pendingFrames.remove(frame))
         return;
@@ -128,10 +142,11 @@ void UserResourceController::RenderViewObserverHelper::runScripts(UserScriptData
 
 void UserResourceController::runScripts(UserScriptData::InjectionPoint p, blink::WebLocalFrame *frame)
 {
-    content::RenderView *renderView = content::RenderView::FromWebView(frame->View());
-    const bool isMainFrame = (frame == renderView->GetWebView()->MainFrame());
+    content::RenderFrame *renderFrame = content::RenderFrame::FromWebFrame(frame);
+    content::RenderView *renderView = renderFrame->GetRenderView();
+    const bool isMainFrame = renderFrame->IsMainFrame();
 
-    QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(globalScriptsIndex).toList();
+    QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).toList();
     scriptsToRun.append(m_viewUserScriptMap.value(renderView).toList());
 
     Q_FOREACH (uint64_t id, scriptsToRun) {
@@ -159,67 +174,89 @@ void UserResourceController::RunScriptsAtDocumentEnd(content::RenderFrame *rende
     runScripts(UserScriptData::DocumentLoadFinished, render_frame->GetWebFrame());
 }
 
-UserResourceController::RenderViewObserverHelper::RenderViewObserverHelper(content::RenderView *renderView)
-    : content::RenderViewObserver(renderView)
+UserResourceController::RenderFrameObserverHelper::RenderFrameObserverHelper(content::RenderFrame *render_frame)
+    : content::RenderFrameObserver(render_frame)
 {
 }
 
-void UserResourceController::RenderViewObserverHelper::DidFinishDocumentLoad(blink::WebLocalFrame *frame)
+UserResourceController::RenderViewObserverHelper::RenderViewObserverHelper(content::RenderView *render_view)
+    : content::RenderViewObserver(render_view)
 {
+}
+
+void UserResourceController::RenderFrameObserverHelper::DidFinishDocumentLoad()
+{
+    blink::WebLocalFrame *frame = render_frame()->GetWebFrame();
     m_pendingFrames.insert(frame);
-    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE, base::Bind(&UserResourceController::RenderViewObserverHelper::runScripts,
+    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE, base::Bind(&UserResourceController::RenderFrameObserverHelper::runScripts,
                                                                                base::Unretained(this), UserScriptData::AfterLoad, frame),
                                                          base::TimeDelta::FromMilliseconds(afterLoadTimeout));
 }
 
-void UserResourceController::RenderViewObserverHelper::DidFinishLoad(blink::WebLocalFrame *frame)
+void UserResourceController::RenderFrameObserverHelper::DidFinishLoad()
 {
+    blink::WebLocalFrame *frame = render_frame()->GetWebFrame();
+
     // DidFinishDocumentLoad always comes before this, so frame has already been marked as pending.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::Bind(&UserResourceController::RenderViewObserverHelper::runScripts,
+    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::Bind(&UserResourceController::RenderFrameObserverHelper::runScripts,
                                                                         base::Unretained(this), UserScriptData::AfterLoad, frame));
 }
 
-void UserResourceController::RenderViewObserverHelper::DidStartProvisionalLoad(blink::WebLocalFrame *frame)
+void UserResourceController::RenderFrameObserverHelper::DidStartProvisionalLoad(blink::WebDataSource *data_source)
 {
+    Q_UNUSED(data_source);
+    blink::WebLocalFrame *frame = render_frame()->GetWebFrame();
     m_pendingFrames.remove(frame);
 }
 
-void UserResourceController::RenderViewObserverHelper::FrameDetached(blink::WebFrame *frame)
+void UserResourceController::RenderFrameObserverHelper::FrameDetached()
 {
-    if (frame->IsWebLocalFrame())
-        m_pendingFrames.remove(frame->ToWebLocalFrame());
+    blink::WebLocalFrame *frame = render_frame()->GetWebFrame();
+    m_pendingFrames.remove(frame);
+}
+
+void UserResourceController::RenderFrameObserverHelper::OnDestruct()
+{
+    // FIXME: Without this the instance will leak, but we can't delete it because the posted tasks
+    // could be executed after the instance is deleted.
+    //delete this;
 }
 
 void UserResourceController::RenderViewObserverHelper::OnDestruct()
 {
+    // Remove all scripts associated with the render view.
     UserResourceController::instance()->renderViewDestroyed(render_view());
+    delete this;
 }
 
-bool UserResourceController::RenderViewObserverHelper::OnMessageReceived(const IPC::Message &message)
+bool UserResourceController::RenderFrameObserverHelper::OnMessageReceived(const IPC::Message &message)
 {
     bool handled = true;
-    IPC_BEGIN_MESSAGE_MAP(UserResourceController::RenderViewObserverHelper, message)
-        IPC_MESSAGE_HANDLER(RenderViewObserverHelper_AddScript, onUserScriptAdded)
-        IPC_MESSAGE_HANDLER(RenderViewObserverHelper_RemoveScript, onUserScriptRemoved)
-        IPC_MESSAGE_HANDLER(RenderViewObserverHelper_ClearScripts, onScriptsCleared)
+    IPC_BEGIN_MESSAGE_MAP(UserResourceController::RenderFrameObserverHelper, message)
+        IPC_MESSAGE_HANDLER(RenderFrameObserverHelper_AddScript, onUserScriptAdded)
+        IPC_MESSAGE_HANDLER(RenderFrameObserverHelper_RemoveScript, onUserScriptRemoved)
+        IPC_MESSAGE_HANDLER(RenderFrameObserverHelper_ClearScripts, onScriptsCleared)
         IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
             return handled;
 }
 
-void UserResourceController::RenderViewObserverHelper::onUserScriptAdded(const UserScriptData &script)
+void UserResourceController::RenderFrameObserverHelper::onUserScriptAdded(const UserScriptData &script)
 {
-    UserResourceController::instance()->addScriptForView(script, render_view());
+    content::RenderView *view = render_frame()->GetRenderView();
+    UserResourceController::instance()->addScriptForView(script, view);
 }
 
-void UserResourceController::RenderViewObserverHelper::onUserScriptRemoved(const UserScriptData &script)
+void UserResourceController::RenderFrameObserverHelper::onUserScriptRemoved(const UserScriptData &script)
 {
-    UserResourceController::instance()->removeScriptForView(script, render_view());
+    content::RenderView *view = render_frame()->GetRenderView();
+    UserResourceController::instance()->removeScriptForView(script, view);
 }
 
-void UserResourceController::RenderViewObserverHelper::onScriptsCleared()
+void UserResourceController::RenderFrameObserverHelper::onScriptsCleared()
 {
-    UserResourceController::instance()->clearScriptsForView(render_view());
+    content::RenderView *view = render_frame()->GetRenderView();
+    UserResourceController::instance()->clearScriptsForView(view);
 }
 
 UserResourceController *UserResourceController::instance()
@@ -248,9 +285,16 @@ UserResourceController::UserResourceController()
 #endif // !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS)
 }
 
+void UserResourceController::renderFrameCreated(content::RenderFrame *renderFrame)
+{
+    // FIXME: Actually make this to be true.
+    // Will destroy itself when the RenderView is destroyed.
+    new RenderFrameObserverHelper(renderFrame);
+}
+
 void UserResourceController::renderViewCreated(content::RenderView *renderView)
 {
-    // Will destroy itself with their RenderView.
+    // Will destroy itself when the RenderView is destroyed.
     new RenderViewObserverHelper(renderView);
 }
 
diff --git a/src/core/renderer/user_resource_controller.h b/src/core/renderer/user_resource_controller.h
index 5d412fe40..50af24243 100644
--- a/src/core/renderer/user_resource_controller.h
+++ b/src/core/renderer/user_resource_controller.h
@@ -61,8 +61,9 @@ class UserResourceController : public content::RenderThreadObserver {
 public:
     static UserResourceController *instance();
     UserResourceController();
+    void renderFrameCreated(content::RenderFrame *);
     void renderViewCreated(content::RenderView *);
-    void renderViewDestroyed(content::RenderView *);
+    void renderViewDestroyed(content::RenderView *renderView);
     void addScriptForView(const UserScriptData &, content::RenderView *);
     void removeScriptForView(const UserScriptData &, content::RenderView *);
     void clearScriptsForView(content::RenderView *);
@@ -73,6 +74,7 @@ public:
 private:
     Q_DISABLE_COPY(UserResourceController)
 
+    class RenderFrameObserverHelper;
     class RenderViewObserverHelper;
 
     // RenderProcessObserver implementation.
@@ -89,7 +91,7 @@ private:
     ViewUserScriptMap m_viewUserScriptMap;
     QHash<uint64_t, UserScriptData> m_scripts;
 
-    friend class RenderViewObserverHelper;
+    friend class RenderFrameObserverHelper;
 };
 
 #endif // USER_RESOURCE_CONTROLLER_H
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
index c685cd465..cec8344b6 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
+++ b/src/core/renderer/web_channel_ipc_transport.cpp
@@ -254,4 +254,9 @@ bool WebChannelIPCTransport::OnMessageReceived(const IPC::Message &message)
     return handled;
 }
 
+void WebChannelIPCTransport::OnDestruct()
+{
+    delete this;
+}
+
 } // namespace
diff --git a/src/core/renderer/web_channel_ipc_transport.h b/src/core/renderer/web_channel_ipc_transport.h
index a2c7d5b4e..04041c6c7 100644
--- a/src/core/renderer/web_channel_ipc_transport.h
+++ b/src/core/renderer/web_channel_ipc_transport.h
@@ -71,7 +71,7 @@ private:
 
     // content::RenderViewObserver overrides:
     bool OnMessageReceived(const IPC::Message &message) override;
-    void OnDestruct() override { }
+    void OnDestruct() override;
 
     bool m_installed;
     uint m_installedWorldId;