Rename UserScriptController/Host to UserResourceController/Host

These classes can operate user stylesheets too.

Change-Id: Ia283af92e52a822b26003ff65e0e7dc391b0904d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index aa32041e4..74bd9899a 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QTimerEvent>
-#include "user_script_controller_host.h"
+#include "user_resource_controller_host.h"
 
 using QtWebEngineCore::UserScript;
 
@@ -302,11 +302,11 @@ void QQuickWebEngineScript::timerEvent(QTimerEvent *e)
     d->m_controllerHost->addUserScript(d->coreScript, d->m_adapter);
 }
 
-void QQuickWebEngineScriptPrivate::bind(QtWebEngineCore::UserScriptControllerHost *scriptController, QtWebEngineCore::WebContentsAdapter *adapter)
+void QQuickWebEngineScriptPrivate::bind(QtWebEngineCore::UserResourceControllerHost *resourceController, QtWebEngineCore::WebContentsAdapter *adapter)
 {
     aboutToUpdateUnderlyingScript();
     m_adapter = adapter;
-    m_controllerHost = scriptController;
+    m_controllerHost = resourceController;
 }
 
 QQuickWebEngineScriptPrivate::QQuickWebEngineScriptPrivate()
diff --git a/src/webengine/api/qquickwebenginescript_p_p.h b/src/webengine/api/qquickwebenginescript_p_p.h
index 6cb0cfa75..4525505c6 100644
--- a/src/webengine/api/qquickwebenginescript_p_p.h
+++ b/src/webengine/api/qquickwebenginescript_p_p.h
@@ -58,7 +58,7 @@
 #include "web_contents_adapter.h"
 
 namespace QtWebEngineCore {
-class UserScriptControllerHost;
+class UserResourceControllerHost;
 class WebContentsAdapter;
 } // namespace
 
@@ -69,11 +69,11 @@ public:
     Q_DECLARE_PUBLIC(QQuickWebEngineScript)
     QQuickWebEngineScriptPrivate();
     void aboutToUpdateUnderlyingScript();
-    void bind(QtWebEngineCore::UserScriptControllerHost *, QtWebEngineCore::WebContentsAdapter * = 0);
+    void bind(QtWebEngineCore::UserResourceControllerHost *, QtWebEngineCore::WebContentsAdapter * = 0);
 
     QtWebEngineCore::UserScript coreScript;
     QBasicTimer m_basicTimer;
-    QtWebEngineCore::UserScriptControllerHost *m_controllerHost;
+    QtWebEngineCore::UserResourceControllerHost *m_controllerHost;
     QtWebEngineCore::WebContentsAdapter *m_adapter;
     QUrl m_sourceUrl;
 
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 17710b5cc..70a85f5f3 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -61,7 +61,7 @@
 #include "render_widget_host_view_qt_delegate_quick.h"
 #include "render_widget_host_view_qt_delegate_quickwindow.h"
 #include "ui_delegates_manager.h"
-#include "user_script_controller_host.h"
+#include "user_resource_controller_host.h"
 #include "web_contents_adapter.h"
 #include "web_engine_error.h"
 #include "web_engine_settings.h"
@@ -761,7 +761,7 @@ void QQuickWebEngineViewPrivate::adoptWebContents(WebContentsAdapter *webContent
 
     // re-bind the userscrips to the new adapter
     Q_FOREACH (QQuickWebEngineScript *script, m_userScripts)
-        script->d_func()->bind(browserContextAdapter()->userScriptController(), adapter.data());
+        script->d_func()->bind(browserContextAdapter()->userResourceController(), adapter.data());
 
     // Emit signals for values that might be different from the previous WebContentsAdapter.
     emit q->titleChanged();
@@ -807,7 +807,7 @@ void QQuickWebEngineViewPrivate::ensureContentsAdapter()
             adapter->load(explicitUrl);
         // push down the page's user scripts
         Q_FOREACH (QQuickWebEngineScript *script, m_userScripts)
-            script->d_func()->bind(browserContextAdapter()->userScriptController(), adapter.data());
+            script->d_func()->bind(browserContextAdapter()->userResourceController(), adapter.data());
     }
 }
 
@@ -1579,12 +1579,12 @@ void QQuickWebEngineViewPrivate::userScripts_append(QQmlListProperty<QQuickWebEn
 {
     Q_ASSERT(p && p->data);
     QQuickWebEngineViewPrivate *d = static_cast<QQuickWebEngineViewPrivate*>(p->data);
-    UserScriptControllerHost *scriptController = d->browserContextAdapter()->userScriptController();
+    UserResourceControllerHost *resourceController = d->browserContextAdapter()->userResourceController();
     d->m_userScripts.append(script);
     // If the adapter hasn't been instantiated, we'll bind the scripts in ensureContentsAdapter()
     if (!d->adapter)
         return;
-    script->d_func()->bind(scriptController, d->adapter.data());
+    script->d_func()->bind(resourceController, d->adapter.data());
 }
 
 int QQuickWebEngineViewPrivate::userScripts_count(QQmlListProperty<QQuickWebEngineScript> *p)
@@ -1605,8 +1605,8 @@ void QQuickWebEngineViewPrivate::userScripts_clear(QQmlListProperty<QQuickWebEng
 {
     Q_ASSERT(p && p->data);
     QQuickWebEngineViewPrivate *d = static_cast<QQuickWebEngineViewPrivate*>(p->data);
-    UserScriptControllerHost *scriptController = d->browserContextAdapter()->userScriptController();
-    scriptController->clearAllScripts(d->adapter.data());
+    UserResourceControllerHost *resourceController = d->browserContextAdapter()->userResourceController();
+    resourceController->clearAllScripts(d->adapter.data());
     d->m_userScripts.clear();
 }