diff options
Diffstat (limited to 'src/core/renderer_host/user_resource_controller_host.cpp')
-rw-r--r-- | src/core/renderer_host/user_resource_controller_host.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp index b24e87e8b..f2a00fc72 100644 --- a/src/core/renderer_host/user_resource_controller_host.cpp +++ b/src/core/renderer_host/user_resource_controller_host.cpp @@ -117,7 +117,7 @@ void UserResourceControllerHost::addUserScript(const UserScript &script, WebCont m_perContentsScripts.insert(contents, currentScripts); } } - GetUserResourceControllerRenderFrame(contents->GetMainFrame()) + GetUserResourceControllerRenderFrame(contents->GetPrimaryMainFrame()) ->AddScript(script.data()); } } @@ -140,7 +140,7 @@ bool UserResourceControllerHost::removeUserScript(const UserScript &script, WebC QList<UserScript>::iterator it = std::find(list.begin(), list.end(), script); if (it == list.end()) return false; - GetUserResourceControllerRenderFrame(contents->GetMainFrame()) + GetUserResourceControllerRenderFrame(contents->GetPrimaryMainFrame()) ->RemoveScript((*it).data()); list.erase(it); } @@ -159,7 +159,7 @@ void UserResourceControllerHost::clearAllScripts(WebContentsAdapter *adapter) m_perContentsScripts.remove(contents); mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame> userResourceController; - GetUserResourceControllerRenderFrame(contents->GetMainFrame()) + GetUserResourceControllerRenderFrame(contents->GetPrimaryMainFrame()) ->ClearScripts(); } } @@ -184,7 +184,7 @@ void UserResourceControllerHost::renderProcessStartedWithHost(content::RenderPro auto userResourceController = new UserResourceControllerRemote; renderer->GetChannel()->GetRemoteAssociatedInterface(userResourceController); m_observedProcesses.insert(renderer, userResourceController); - for (const UserScript &script : qAsConst(m_profileWideScripts)) { + for (const UserScript &script : std::as_const(m_profileWideScripts)) { (*userResourceController)->AddScript(script.data()); } } |