summaryrefslogtreecommitdiffstats
path: root/src/core/user_script_controller_host.cpp
diff options
context:
space:
mode:
authorAdam Kallai <kadam@inf.u-szeged.hu>2015-04-20 01:50:45 -0700
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-04-21 12:26:07 +0000
commit5bdd41388fab6486061d1bd25be132533d05d711 (patch)
tree8b59bee5e8f277e0d3fec5026484e5bd267d5cfd /src/core/user_script_controller_host.cpp
parent7ff8dc3dbfe4effce66bee8b7b59284f4b2f95be (diff)
Fix assignment of observer to RenderProcessHost.
By default Chromium uses the process-per-site-instance process model. Therefore if there is a renderProcessHost which is already observed we do not need to add another observer for user scripts. Change-Id: Ic0c2104ebbefb2b8427c43c4c665d96b5a991ba1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/user_script_controller_host.cpp')
-rw-r--r--src/core/user_script_controller_host.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/user_script_controller_host.cpp b/src/core/user_script_controller_host.cpp
index 2f4a55c27..227a639b1 100644
--- a/src/core/user_script_controller_host.cpp
+++ b/src/core/user_script_controller_host.cpp
@@ -186,8 +186,11 @@ void UserScriptControllerHost::reserve(WebContentsAdapter *adapter, int count)
m_perContentsScripts[adapter->webContents()].reserve(count);
}
-void UserScriptControllerHost::renderProcessHostCreated(content::RenderProcessHost *renderer)
+void UserScriptControllerHost::renderProcessStartedWithHost(content::RenderProcessHost *renderer)
{
+ if (m_observedProcesses.contains(renderer))
+ return;
+
if (m_renderProcessObserver.isNull())
m_renderProcessObserver.reset(new RenderProcessObserverHelper(this));
renderer->AddObserver(m_renderProcessObserver.data());