diff options
20 files changed, 124 insertions, 126 deletions
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index dea845e68..19280cf10 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -48,7 +48,7 @@ #include "web_engine_context.h" #include "web_engine_visited_links_manager.h" #include "url_request_context_getter_qt.h" -#include "user_script_controller_host.h" +#include "user_resource_controller_host.h" #include "net/proxy/proxy_service.h" @@ -391,11 +391,11 @@ void BrowserContextAdapter::addCustomUrlSchemeHandler(const QByteArray &scheme, updateCustomUrlSchemeHandlers(); } -UserScriptControllerHost *BrowserContextAdapter::userScriptController() +UserResourceControllerHost *BrowserContextAdapter::userResourceController() { - if (!m_userScriptController) - m_userScriptController.reset(new UserScriptControllerHost); - return m_userScriptController.data(); + if (!m_userResourceController) + m_userResourceController.reset(new UserResourceControllerHost); + return m_userResourceController.data(); } void BrowserContextAdapter::permissionRequestReply(const QUrl &origin, PermissionType type, bool reply) diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h index 8eb7631f7..55ab688a7 100644 --- a/src/core/browser_context_adapter.h +++ b/src/core/browser_context_adapter.h @@ -60,7 +60,7 @@ namespace QtWebEngineCore { class BrowserContextAdapterClient; class BrowserContextQt; class DownloadManagerDelegateQt; -class UserScriptControllerHost; +class UserResourceControllerHost; class WebEngineVisitedLinksManager; class QWEBENGINE_EXPORT BrowserContextAdapter : public QSharedData @@ -160,7 +160,7 @@ public: void addCustomUrlSchemeHandler(const QByteArray &, QWebEngineUrlSchemeHandler *); bool removeCustomUrlSchemeHandler(QWebEngineUrlSchemeHandler *); QWebEngineUrlSchemeHandler *takeCustomUrlSchemeHandler(const QByteArray &); - UserScriptControllerHost *userScriptController(); + UserResourceControllerHost *userResourceController(); void permissionRequestReply(const QUrl &origin, PermissionType type, bool reply); @@ -176,7 +176,7 @@ private: QScopedPointer<BrowserContextQt> m_browserContext; QScopedPointer<WebEngineVisitedLinksManager> m_visitedLinksManager; QScopedPointer<DownloadManagerDelegateQt> m_downloadManagerDelegate; - QScopedPointer<UserScriptControllerHost> m_userScriptController; + QScopedPointer<UserResourceControllerHost> m_userResourceController; QScopedPointer<QWebEngineCookieStore> m_cookieStore; QPointer<QWebEngineUrlRequestInterceptor> m_requestInterceptor; diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h index de30c34d6..d76b1c911 100644 --- a/src/core/common/qt_messages.h +++ b/src/core/common/qt_messages.h @@ -45,9 +45,9 @@ IPC_MESSAGE_ROUTED1(RenderViewObserverHelper_RemoveScript, UserScriptData /* script */) IPC_MESSAGE_ROUTED0(RenderViewObserverHelper_ClearScripts) -IPC_MESSAGE_CONTROL1(UserScriptController_AddScript, UserScriptData /* scriptContents */) -IPC_MESSAGE_CONTROL1(UserScriptController_RemoveScript, UserScriptData /* scriptContents */) -IPC_MESSAGE_CONTROL0(UserScriptController_ClearScripts) +IPC_MESSAGE_CONTROL1(UserResourceController_AddScript, UserScriptData /* scriptContents */) +IPC_MESSAGE_CONTROL1(UserResourceController_RemoveScript, UserScriptData /* scriptContents */) +IPC_MESSAGE_CONTROL0(UserResourceController_ClearScripts) //----------------------------------------------------------------------------- // WebContents messages diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 9e021dd6a..97d43fb90 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -80,7 +80,7 @@ #include "printing_message_filter_qt.h" #endif // defined(ENABLE_BASIC_PRINTING) #include "resource_dispatcher_host_delegate_qt.h" -#include "user_script_controller_host.h" +#include "user_resource_controller_host.h" #include "web_contents_delegate_qt.h" #include "web_engine_context.h" #include "web_engine_library_info.h" @@ -360,7 +360,7 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost* // FIXME: Add a settings variable to enable/disable the file scheme. const int id = host->GetID(); content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(id, url::kFileScheme); - static_cast<BrowserContextQt*>(host->GetBrowserContext())->m_adapter->userScriptController()->renderProcessStartedWithHost(host); + static_cast<BrowserContextQt*>(host->GetBrowserContext())->m_adapter->userResourceController()->renderProcessStartedWithHost(host); #if defined(ENABLE_PEPPER_CDMS) host->AddFilter(new BrowserMessageFilterQt(id)); #endif diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 5e6641d51..327ad9625 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -76,7 +76,7 @@ SOURCES = \ renderer/pepper/pepper_renderer_host_factory_qt.cpp \ renderer/render_frame_observer_qt.cpp \ renderer/render_view_observer_qt.cpp \ - renderer/user_script_controller.cpp \ + renderer/user_resource_controller.cpp \ renderer/web_channel_ipc_transport.cpp \ resource_bundle_qt.cpp \ resource_context_qt.cpp \ @@ -88,8 +88,8 @@ SOURCES = \ url_request_custom_job.cpp \ url_request_custom_job_delegate.cpp \ url_request_qrc_job_qt.cpp \ + user_resource_controller_host.cpp \ user_script.cpp \ - user_script_controller_host.cpp \ web_channel_ipc_transport_host.cpp \ web_contents_adapter.cpp \ web_contents_delegate_qt.cpp \ @@ -156,7 +156,7 @@ HEADERS = \ renderer/pepper/pepper_renderer_host_factory_qt.h \ renderer/render_frame_observer_qt.h \ renderer/render_view_observer_qt.h \ - renderer/user_script_controller.h \ + renderer/user_resource_controller.h \ renderer/web_channel_ipc_transport.h \ resource_context_qt.h \ resource_dispatcher_host_delegate_qt.h \ @@ -167,8 +167,8 @@ HEADERS = \ url_request_custom_job.h \ url_request_custom_job_delegate.h \ url_request_qrc_job_qt.h \ + user_resource_controller_host.h \ user_script.h \ - user_script_controller_host.h \ web_channel_ipc_transport_host.h \ web_contents_adapter.h \ web_contents_adapter_client.h \ diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 77d93226c..3d235ff0b 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -74,7 +74,7 @@ #include "renderer/render_frame_observer_qt.h" #include "renderer/render_view_observer_qt.h" -#include "renderer/user_script_controller.h" +#include "renderer/user_resource_controller.h" #include "grit/renderer_resources.h" @@ -100,7 +100,7 @@ void ContentRendererClientQt::RenderThreadStarted() m_webCacheObserver.reset(new web_cache::WebCacheRenderProcessObserver()); renderThread->AddObserver(m_visitedLinkSlave.data()); renderThread->AddObserver(m_webCacheObserver.data()); - renderThread->AddObserver(UserScriptController::instance()); + renderThread->AddObserver(UserResourceController::instance()); // mark qrc as a secure scheme (avoids deprecation warnings) blink::WebSecurityPolicy::registerURLSchemeAsSecure(blink::WebString::fromLatin1(kQrcSchemeQt)); @@ -115,7 +115,7 @@ void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view // RenderViewObservers destroy themselves with their RenderView. new RenderViewObserverQt(render_view, m_webCacheObserver.data()); new WebChannelIPCTransport(render_view); - UserScriptController::instance()->renderViewCreated(render_view); + UserResourceController::instance()->renderViewCreated(render_view); #if defined(ENABLE_SPELLCHECK) new SpellCheckProvider(render_view, m_spellCheck.data()); #endif diff --git a/src/core/renderer/user_script_controller.cpp b/src/core/renderer/user_resource_controller.cpp index 2a7778db3..0927aa53a 100644 --- a/src/core/renderer/user_script_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "user_script_controller.h" +#include "user_resource_controller.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_observer.h" @@ -49,14 +49,14 @@ #include "common/qt_messages.h" #include "common/user_script_data.h" -Q_GLOBAL_STATIC(UserScriptController, qt_webengine_userScriptController) +Q_GLOBAL_STATIC(UserResourceController, qt_webengine_userResourceController) static content::RenderView * const globalScriptsIndex = 0; // Scripts meant to run after the load event will be run 500ms after DOMContentLoaded if the load event doesn't come within that delay. static const int afterLoadTimeout = 500; -class UserScriptController::RenderViewObserverHelper : public content::RenderViewObserver +class UserResourceController::RenderViewObserverHelper : public content::RenderViewObserver { public: RenderViewObserverHelper(content::RenderView *); @@ -78,18 +78,18 @@ private: QSet<blink::WebLocalFrame *> m_pendingFrames; }; -void UserScriptController::RenderViewObserverHelper::runScripts(UserScriptData::InjectionPoint p, blink::WebLocalFrame *frame) +void UserResourceController::RenderViewObserverHelper::runScripts(UserScriptData::InjectionPoint p, blink::WebLocalFrame *frame) { if (p == UserScriptData::AfterLoad && !m_pendingFrames.remove(frame)) return; content::RenderView *renderView = content::RenderView::FromWebView(frame->view()); const bool isMainFrame = (frame == renderView->GetWebView()->mainFrame()); - QList<uint64> scriptsToRun = UserScriptController::instance()->m_viewUserScriptMap.value(globalScriptsIndex).toList(); - scriptsToRun.append(UserScriptController::instance()->m_viewUserScriptMap.value(renderView).toList()); + QList<uint64> scriptsToRun = UserResourceController::instance()->m_viewUserScriptMap.value(globalScriptsIndex).toList(); + scriptsToRun.append(UserResourceController::instance()->m_viewUserScriptMap.value(renderView).toList()); Q_FOREACH (uint64 id, scriptsToRun) { - const UserScriptData &script = UserScriptController::instance()->m_scripts.value(id); + const UserScriptData &script = UserResourceController::instance()->m_scripts.value(id); if (script.injectionPoint != p || (!script.injectForSubframes && !isMainFrame)) continue; @@ -102,52 +102,52 @@ void UserScriptController::RenderViewObserverHelper::runScripts(UserScriptData:: } -UserScriptController::RenderViewObserverHelper::RenderViewObserverHelper(content::RenderView *renderView) +UserResourceController::RenderViewObserverHelper::RenderViewObserverHelper(content::RenderView *renderView) : content::RenderViewObserver(renderView) { } -void UserScriptController::RenderViewObserverHelper::DidCreateDocumentElement(blink::WebLocalFrame *frame) +void UserResourceController::RenderViewObserverHelper::DidCreateDocumentElement(blink::WebLocalFrame *frame) { runScripts(UserScriptData::DocumentElementCreation, frame); } -void UserScriptController::RenderViewObserverHelper::DidFinishDocumentLoad(blink::WebLocalFrame *frame) +void UserResourceController::RenderViewObserverHelper::DidFinishDocumentLoad(blink::WebLocalFrame *frame) { runScripts(UserScriptData::DocumentLoadFinished, frame); m_pendingFrames.insert(frame); - base::MessageLoop::current()->PostDelayedTask(FROM_HERE, base::Bind(&UserScriptController::RenderViewObserverHelper::runScripts, + base::MessageLoop::current()->PostDelayedTask(FROM_HERE, base::Bind(&UserResourceController::RenderViewObserverHelper::runScripts, base::Unretained(this), UserScriptData::AfterLoad, frame), base::TimeDelta::FromMilliseconds(afterLoadTimeout)); } -void UserScriptController::RenderViewObserverHelper::DidFinishLoad(blink::WebLocalFrame *frame) +void UserResourceController::RenderViewObserverHelper::DidFinishLoad(blink::WebLocalFrame *frame) { // DidFinishDocumentLoad always comes before this, so frame has already been marked as pending. - base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&UserScriptController::RenderViewObserverHelper::runScripts, + base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&UserResourceController::RenderViewObserverHelper::runScripts, base::Unretained(this), UserScriptData::AfterLoad, frame)); } -void UserScriptController::RenderViewObserverHelper::DidStartProvisionalLoad(blink::WebLocalFrame *frame) +void UserResourceController::RenderViewObserverHelper::DidStartProvisionalLoad(blink::WebLocalFrame *frame) { m_pendingFrames.remove(frame); } -void UserScriptController::RenderViewObserverHelper::FrameDetached(blink::WebFrame *frame) +void UserResourceController::RenderViewObserverHelper::FrameDetached(blink::WebFrame *frame) { if (frame->isWebLocalFrame()) m_pendingFrames.remove(frame->toWebLocalFrame()); } -void UserScriptController::RenderViewObserverHelper::OnDestruct() +void UserResourceController::RenderViewObserverHelper::OnDestruct() { - UserScriptController::instance()->renderViewDestroyed(render_view()); + UserResourceController::instance()->renderViewDestroyed(render_view()); } -bool UserScriptController::RenderViewObserverHelper::OnMessageReceived(const IPC::Message &message) +bool UserResourceController::RenderViewObserverHelper::OnMessageReceived(const IPC::Message &message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP(UserScriptController::RenderViewObserverHelper, message) + 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) @@ -156,39 +156,39 @@ bool UserScriptController::RenderViewObserverHelper::OnMessageReceived(const IPC return handled; } -void UserScriptController::RenderViewObserverHelper::onUserScriptAdded(const UserScriptData &script) +void UserResourceController::RenderViewObserverHelper::onUserScriptAdded(const UserScriptData &script) { - UserScriptController::instance()->addScriptForView(script, render_view()); + UserResourceController::instance()->addScriptForView(script, render_view()); } -void UserScriptController::RenderViewObserverHelper::onUserScriptRemoved(const UserScriptData &script) +void UserResourceController::RenderViewObserverHelper::onUserScriptRemoved(const UserScriptData &script) { - UserScriptController::instance()->removeScriptForView(script, render_view()); + UserResourceController::instance()->removeScriptForView(script, render_view()); } -void UserScriptController::RenderViewObserverHelper::onScriptsCleared() +void UserResourceController::RenderViewObserverHelper::onScriptsCleared() { - UserScriptController::instance()->clearScriptsForView(render_view()); + UserResourceController::instance()->clearScriptsForView(render_view()); } -UserScriptController *UserScriptController::instance() +UserResourceController *UserResourceController::instance() { - return qt_webengine_userScriptController(); + return qt_webengine_userResourceController(); } -bool UserScriptController::OnControlMessageReceived(const IPC::Message &message) +bool UserResourceController::OnControlMessageReceived(const IPC::Message &message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP(UserScriptController, message) - IPC_MESSAGE_HANDLER(UserScriptController_AddScript, onAddScript) - IPC_MESSAGE_HANDLER(UserScriptController_RemoveScript, onRemoveScript) - IPC_MESSAGE_HANDLER(UserScriptController_ClearScripts, onClearScripts) + IPC_BEGIN_MESSAGE_MAP(UserResourceController, message) + IPC_MESSAGE_HANDLER(UserResourceController_AddScript, onAddScript) + IPC_MESSAGE_HANDLER(UserResourceController_RemoveScript, onRemoveScript) + IPC_MESSAGE_HANDLER(UserResourceController_ClearScripts, onClearScripts) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -UserScriptController::UserScriptController() +UserResourceController::UserResourceController() { #if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS) static bool onlyCalledOnce = true; @@ -197,13 +197,13 @@ UserScriptController::UserScriptController() #endif // !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS) } -void UserScriptController::renderViewCreated(content::RenderView *renderView) +void UserResourceController::renderViewCreated(content::RenderView *renderView) { // Will destroy itself with their RenderView. new RenderViewObserverHelper(renderView); } -void UserScriptController::renderViewDestroyed(content::RenderView *renderView) +void UserResourceController::renderViewDestroyed(content::RenderView *renderView) { ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(renderView); if (it == m_viewUserScriptMap.end()) // ASSERT maybe? @@ -214,7 +214,7 @@ void UserScriptController::renderViewDestroyed(content::RenderView *renderView) m_viewUserScriptMap.remove(renderView); } -void UserScriptController::addScriptForView(const UserScriptData &script, content::RenderView *view) +void UserResourceController::addScriptForView(const UserScriptData &script, content::RenderView *view) { ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(view); if (it == m_viewUserScriptMap.end()) @@ -224,7 +224,7 @@ void UserScriptController::addScriptForView(const UserScriptData &script, conten m_scripts.insert(script.scriptId, script); } -void UserScriptController::removeScriptForView(const UserScriptData &script, content::RenderView *view) +void UserResourceController::removeScriptForView(const UserScriptData &script, content::RenderView *view) { ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(view); if (it == m_viewUserScriptMap.end()) @@ -234,7 +234,7 @@ void UserScriptController::removeScriptForView(const UserScriptData &script, con m_scripts.remove(script.scriptId); } -void UserScriptController::clearScriptsForView(content::RenderView *view) +void UserResourceController::clearScriptsForView(content::RenderView *view) { ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(view); if (it == m_viewUserScriptMap.end()) @@ -245,17 +245,17 @@ void UserScriptController::clearScriptsForView(content::RenderView *view) m_viewUserScriptMap.remove(view); } -void UserScriptController::onAddScript(const UserScriptData &script) +void UserResourceController::onAddScript(const UserScriptData &script) { addScriptForView(script, globalScriptsIndex); } -void UserScriptController::onRemoveScript(const UserScriptData &script) +void UserResourceController::onRemoveScript(const UserScriptData &script) { removeScriptForView(script, globalScriptsIndex); } -void UserScriptController::onClearScripts() +void UserResourceController::onClearScripts() { clearScriptsForView(globalScriptsIndex); } diff --git a/src/core/renderer/user_script_controller.h b/src/core/renderer/user_resource_controller.h index 15a057074..b2f7d92c3 100644 --- a/src/core/renderer/user_script_controller.h +++ b/src/core/renderer/user_resource_controller.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef USER_SCRIPT_CONTROLLER_H -#define USER_SCRIPT_CONTROLLER_H +#ifndef USER_RESOURCE_CONTROLLER_H +#define USER_RESOURCE_CONTROLLER_H #include "content/public/renderer/render_process_observer.h" @@ -53,11 +53,11 @@ class RenderView; } -class UserScriptController : public content::RenderProcessObserver { +class UserResourceController : public content::RenderProcessObserver { public: - static UserScriptController *instance(); - UserScriptController(); + static UserResourceController *instance(); + UserResourceController(); void renderViewCreated(content::RenderView *); void renderViewDestroyed(content::RenderView *); void addScriptForView(const UserScriptData &, content::RenderView *); @@ -65,7 +65,7 @@ public: void clearScriptsForView(content::RenderView *); private: - Q_DISABLE_COPY(UserScriptController) + Q_DISABLE_COPY(UserResourceController) class RenderViewObserverHelper; @@ -82,4 +82,4 @@ private: QHash<uint64, UserScriptData> m_scripts; }; -#endif // USER_SCRIPT_CONTROLLER_H +#endif // USER_RESOURCE_CONTROLLER_H diff --git a/src/core/user_script_controller_host.cpp b/src/core/user_resource_controller_host.cpp index 799996987..b2de41cc0 100644 --- a/src/core/user_script_controller_host.cpp +++ b/src/core/user_resource_controller_host.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "user_script_controller_host.h" +#include "user_resource_controller_host.h" #include "common/qt_messages.h" #include "type_conversion.h" @@ -52,9 +52,9 @@ namespace QtWebEngineCore { -class UserScriptControllerHost::WebContentsObserverHelper : public content::WebContentsObserver { +class UserResourceControllerHost::WebContentsObserverHelper : public content::WebContentsObserver { public: - WebContentsObserverHelper(UserScriptControllerHost *, content::WebContents *); + WebContentsObserverHelper(UserResourceControllerHost *, content::WebContents *); // WebContentsObserver overrides: void RenderViewCreated(content::RenderViewHost *renderViewHost) override; @@ -62,23 +62,23 @@ public: void WebContentsDestroyed() override; private: - UserScriptControllerHost *m_controllerHost; + UserResourceControllerHost *m_controllerHost; }; -UserScriptControllerHost::WebContentsObserverHelper::WebContentsObserverHelper(UserScriptControllerHost *controller, content::WebContents *contents) +UserResourceControllerHost::WebContentsObserverHelper::WebContentsObserverHelper(UserResourceControllerHost *controller, content::WebContents *contents) : content::WebContentsObserver(contents) , m_controllerHost(controller) { } -void UserScriptControllerHost::WebContentsObserverHelper::RenderViewCreated(content::RenderViewHost *renderViewHost) +void UserResourceControllerHost::WebContentsObserverHelper::RenderViewCreated(content::RenderViewHost *renderViewHost) { content::WebContents *contents = web_contents(); Q_FOREACH (const UserScript &script, m_controllerHost->m_perContentsScripts.value(contents)) renderViewHost->Send(new RenderViewObserverHelper_AddScript(renderViewHost->GetRoutingID(), script.data())); } -void UserScriptControllerHost::WebContentsObserverHelper::RenderViewHostChanged(content::RenderViewHost *oldHost, +void UserResourceControllerHost::WebContentsObserverHelper::RenderViewHostChanged(content::RenderViewHost *oldHost, content::RenderViewHost *newHost) { oldHost->Send(new RenderViewObserverHelper_ClearScripts(oldHost->GetRoutingID())); @@ -88,32 +88,32 @@ void UserScriptControllerHost::WebContentsObserverHelper::RenderViewHostChanged( newHost->Send(new RenderViewObserverHelper_AddScript(newHost->GetRoutingID(), script.data())); } -void UserScriptControllerHost::WebContentsObserverHelper::WebContentsDestroyed() +void UserResourceControllerHost::WebContentsObserverHelper::WebContentsDestroyed() { m_controllerHost->webContentsDestroyed(web_contents()); delete this; } -class UserScriptControllerHost::RenderProcessObserverHelper : public content::RenderProcessHostObserver { +class UserResourceControllerHost::RenderProcessObserverHelper : public content::RenderProcessHostObserver { public: - RenderProcessObserverHelper(UserScriptControllerHost *); + RenderProcessObserverHelper(UserResourceControllerHost *); virtual void RenderProcessHostDestroyed(content::RenderProcessHost *) Q_DECL_OVERRIDE; private: - UserScriptControllerHost *m_controllerHost; + UserResourceControllerHost *m_controllerHost; }; -UserScriptControllerHost::RenderProcessObserverHelper::RenderProcessObserverHelper(UserScriptControllerHost *controller) +UserResourceControllerHost::RenderProcessObserverHelper::RenderProcessObserverHelper(UserResourceControllerHost *controller) : m_controllerHost(controller) { } -void UserScriptControllerHost::RenderProcessObserverHelper::RenderProcessHostDestroyed(content::RenderProcessHost *renderer) +void UserResourceControllerHost::RenderProcessObserverHelper::RenderProcessHostDestroyed(content::RenderProcessHost *renderer) { Q_ASSERT(m_controllerHost); m_controllerHost->m_observedProcesses.remove(renderer); } -void UserScriptControllerHost::addUserScript(const UserScript &script, WebContentsAdapter *adapter) +void UserResourceControllerHost::addUserScript(const UserScript &script, WebContentsAdapter *adapter) { if (script.isNull()) return; @@ -122,7 +122,7 @@ void UserScriptControllerHost::addUserScript(const UserScript &script, WebConten if (!m_profileWideScripts.contains(script)) { m_profileWideScripts.append(script); Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) - renderer->Send(new UserScriptController_AddScript(script.data())); + renderer->Send(new UserResourceController_AddScript(script.data())); } } else { content::WebContents *contents = adapter->webContents(); @@ -143,7 +143,7 @@ void UserScriptControllerHost::addUserScript(const UserScript &script, WebConten } } -bool UserScriptControllerHost::containsUserScript(const UserScript &script, WebContentsAdapter *adapter) +bool UserResourceControllerHost::containsUserScript(const UserScript &script, WebContentsAdapter *adapter) { if (script.isNull()) return false; @@ -153,7 +153,7 @@ bool UserScriptControllerHost::containsUserScript(const UserScript &script, WebC return m_perContentsScripts.value(adapter->webContents()).contains(script); } -bool UserScriptControllerHost::removeUserScript(const UserScript &script, WebContentsAdapter *adapter) +bool UserResourceControllerHost::removeUserScript(const UserScript &script, WebContentsAdapter *adapter) { if (script.isNull()) return false; @@ -163,7 +163,7 @@ bool UserScriptControllerHost::removeUserScript(const UserScript &script, WebCon if (it == m_profileWideScripts.end()) return false; Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) - renderer->Send(new UserScriptController_RemoveScript((*it).data())); + renderer->Send(new UserResourceController_RemoveScript((*it).data())); m_profileWideScripts.erase(it); } else { content::WebContents *contents = adapter->webContents(); @@ -179,12 +179,12 @@ bool UserScriptControllerHost::removeUserScript(const UserScript &script, WebCon return true; } -void UserScriptControllerHost::clearAllScripts(WebContentsAdapter *adapter) +void UserResourceControllerHost::clearAllScripts(WebContentsAdapter *adapter) { if (!adapter) { m_profileWideScripts.clear(); Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) - renderer->Send(new UserScriptController_ClearScripts); + renderer->Send(new UserResourceController_ClearScripts); } else { content::WebContents *contents = adapter->webContents(); m_perContentsScripts.remove(contents); @@ -192,14 +192,14 @@ void UserScriptControllerHost::clearAllScripts(WebContentsAdapter *adapter) } } -const QList<UserScript> UserScriptControllerHost::registeredScripts(WebContentsAdapter *adapter) const +const QList<UserScript> UserResourceControllerHost::registeredScripts(WebContentsAdapter *adapter) const { if (!adapter) return m_profileWideScripts; return m_perContentsScripts.value(adapter->webContents()); } -void UserScriptControllerHost::reserve(WebContentsAdapter *adapter, int count) +void UserResourceControllerHost::reserve(WebContentsAdapter *adapter, int count) { if (!adapter) m_profileWideScripts.reserve(count); @@ -207,7 +207,7 @@ void UserScriptControllerHost::reserve(WebContentsAdapter *adapter, int count) m_perContentsScripts[adapter->webContents()].reserve(count); } -void UserScriptControllerHost::renderProcessStartedWithHost(content::RenderProcessHost *renderer) +void UserResourceControllerHost::renderProcessStartedWithHost(content::RenderProcessHost *renderer) { if (m_observedProcesses.contains(renderer)) return; @@ -217,19 +217,19 @@ void UserScriptControllerHost::renderProcessStartedWithHost(content::RenderProce renderer->AddObserver(m_renderProcessObserver.data()); m_observedProcesses.insert(renderer); Q_FOREACH (const UserScript &script, m_profileWideScripts) - renderer->Send(new UserScriptController_AddScript(script.data())); + renderer->Send(new UserResourceController_AddScript(script.data())); } -void UserScriptControllerHost::webContentsDestroyed(content::WebContents *contents) +void UserResourceControllerHost::webContentsDestroyed(content::WebContents *contents) { m_perContentsScripts.remove(contents); } -UserScriptControllerHost::UserScriptControllerHost() +UserResourceControllerHost::UserResourceControllerHost() { } -UserScriptControllerHost::~UserScriptControllerHost() +UserResourceControllerHost::~UserResourceControllerHost() { Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) renderer->RemoveObserver(m_renderProcessObserver.data()); diff --git a/src/core/user_script_controller_host.h b/src/core/user_resource_controller_host.h index ea2160678..8e6e1e3bf 100644 --- a/src/core/user_script_controller_host.h +++ b/src/core/user_resource_controller_host.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef USER_SCRIPT_CONTROLLER_HOST_H -#define USER_SCRIPT_CONTROLLER_HOST_H +#ifndef USER_RESOURCE_CONTROLLER_HOST_H +#define USER_RESOURCE_CONTROLLER_HOST_H #include "qtwebenginecoreglobal.h" @@ -56,11 +56,11 @@ namespace QtWebEngineCore { class WebContentsAdapter; class WebContentsAdapterPrivate; -class QWEBENGINE_EXPORT UserScriptControllerHost { +class QWEBENGINE_EXPORT UserResourceControllerHost { public: - UserScriptControllerHost(); - ~UserScriptControllerHost(); + UserResourceControllerHost(); + ~UserResourceControllerHost(); void addUserScript(const UserScript &script, WebContentsAdapter *adapter); bool containsUserScript(const UserScript &script, WebContentsAdapter *adapter); @@ -72,7 +72,7 @@ public: void renderProcessStartedWithHost(content::RenderProcessHost *renderer); private: - Q_DISABLE_COPY(UserScriptControllerHost) + Q_DISABLE_COPY(UserResourceControllerHost) class WebContentsObserverHelper; class RenderProcessObserverHelper; @@ -87,4 +87,4 @@ private: } // namespace -#endif // USER_SCRIPT_CONTROLLER_HOST_H +#endif // USER_RESOURCE_CONTROLLER_HOST_H diff --git a/src/core/user_script.cpp b/src/core/user_script.cpp index 20764eeb0..839eff366 100644 --- a/src/core/user_script.cpp +++ b/src/core/user_script.cpp @@ -39,7 +39,6 @@ #include "common/user_script_data.h" #include "user_script.h" -#include "user_script_controller_host.h" #include "type_conversion.h" namespace QtWebEngineCore { diff --git a/src/core/user_script.h b/src/core/user_script.h index 6835f4d20..9d7d66a58 100644 --- a/src/core/user_script.h +++ b/src/core/user_script.h @@ -51,7 +51,7 @@ struct UserScriptData; namespace QtWebEngineCore { -class UserScriptControllerHost; +class UserResourceControllerHost; class QWEBENGINE_EXPORT UserScript : public QSharedData { public: @@ -88,7 +88,7 @@ public: private: void initData(); UserScriptData &data() const; - friend class UserScriptControllerHost; + friend class UserResourceControllerHost; QScopedPointer<UserScriptData> scriptData; QString m_name; diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h index 01cb8507a..0507ebf4a 100644 --- a/src/core/web_contents_adapter_p.h +++ b/src/core/web_contents_adapter_p.h @@ -73,7 +73,6 @@ namespace QtWebEngineCore { class BrowserContextAdapter; class RenderViewObserverHostQt; -class UserScriptControllerHost; class WebChannelIPCTransportHost; class WebContentsAdapterClient; class WebContentsDelegateQt; 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(); } diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 18e592f0d..eecd40708 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -109,7 +109,7 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile) , settings(new QWebEngineSettings(profile->settings())) , view(0) , isLoading(false) - , scriptCollection(new QWebEngineScriptCollectionPrivate(browserContextAdapter()->userScriptController(), adapter.data())) + , scriptCollection(new QWebEngineScriptCollectionPrivate(browserContextAdapter()->userResourceController(), adapter.data())) , m_isBeingAdopted(false) , m_backgroundColor(Qt::white) , fullscreenMode(false) diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp index 8a6523a1b..62836c5f9 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/webenginewidgets/api/qwebengineprofile.cpp @@ -120,7 +120,7 @@ using QtWebEngineCore::BrowserContextAdapter; QWebEngineProfilePrivate::QWebEngineProfilePrivate(BrowserContextAdapter* browserContext) : m_settings(new QWebEngineSettings()) - , m_scriptCollection(new QWebEngineScriptCollection(new QWebEngineScriptCollectionPrivate(browserContext->userScriptController()))) + , m_scriptCollection(new QWebEngineScriptCollection(new QWebEngineScriptCollectionPrivate(browserContext->userResourceController()))) , m_browserContextRef(browserContext) { m_browserContextRef->addClient(this); diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.cpp b/src/webenginewidgets/api/qwebenginescriptcollection.cpp index c53172261..a31c26a16 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection.cpp +++ b/src/webenginewidgets/api/qwebenginescriptcollection.cpp @@ -40,7 +40,7 @@ #include "qwebenginescriptcollection.h" #include "qwebenginescriptcollection_p.h" -#include "user_script_controller_host.h" +#include "user_resource_controller_host.h" using QtWebEngineCore::UserScript; @@ -167,7 +167,7 @@ QList<QWebEngineScript> QWebEngineScriptCollection::toList() const } -QWebEngineScriptCollectionPrivate::QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserScriptControllerHost *controller, QtWebEngineCore::WebContentsAdapter *webContents) +QWebEngineScriptCollectionPrivate::QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserResourceControllerHost *controller, QtWebEngineCore::WebContentsAdapter *webContents) : m_scriptController(controller) , m_contents(webContents) { diff --git a/src/webenginewidgets/api/qwebenginescriptcollection_p.h b/src/webenginewidgets/api/qwebenginescriptcollection_p.h index 185b590c4..008453224 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection_p.h +++ b/src/webenginewidgets/api/qwebenginescriptcollection_p.h @@ -58,14 +58,14 @@ #include <QtCore/QSet> namespace QtWebEngineCore { -class UserScriptControllerHost; +class UserResourceControllerHost; class WebContentsAdapter; } // namespace QT_BEGIN_NAMESPACE class QWebEngineScriptCollectionPrivate { public: - QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserScriptControllerHost *, QtWebEngineCore::WebContentsAdapter * = 0); + QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserResourceControllerHost *, QtWebEngineCore::WebContentsAdapter * = 0); int count() const; bool contains(const QWebEngineScript &) const; @@ -80,7 +80,7 @@ public: void reserve(int); private: - QtWebEngineCore::UserScriptControllerHost *m_scriptController; + QtWebEngineCore::UserResourceControllerHost *m_scriptController; QtWebEngineCore::WebContentsAdapter *m_contents; }; |