diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 13:21:32 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 13:31:01 +0300 |
| commit | 3cd4e0aa7961889eb06374885ed648f5b9bd85bc (patch) | |
| tree | 6a089aedea155b1f1a74b553f4d1b57c70554a8f /src/core/renderer_host | |
| parent | 6d029165d1593c514db08c34d6b08a00a4435d5e (diff) | |
| parent | 38063a6332b9f948a0381763271e9a9ac7af0999 (diff) | |
Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensource6.2.9
Qt 6.2.9-lts release
Conflicts solved:
dependencies.yaml
examples/webenginewidgets/push-notifications/CMakeLists.txt
Change-Id: I0127c2575369f6939df89f3301659470d481b9bf
Diffstat (limited to 'src/core/renderer_host')
| -rw-r--r-- | src/core/renderer_host/user_resource_controller_host.cpp | 6 | ||||
| -rw-r--r-- | src/core/renderer_host/web_channel_ipc_transport_host.cpp | 24 | ||||
| -rw-r--r-- | src/core/renderer_host/web_engine_page_host.cpp | 6 |
3 files changed, 17 insertions, 19 deletions
diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp index 98a640695..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(); } } diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.cpp b/src/core/renderer_host/web_channel_ipc_transport_host.cpp index d234fb141..0824ed56d 100644 --- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp +++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp @@ -30,10 +30,9 @@ WebChannelIPCTransportHost::WebChannelIPCTransportHost(content::WebContents *con , m_worldId(worldId) , m_receiver(contents, this) { - contents->ForEachFrame(base::BindRepeating([](WebChannelIPCTransportHost *that, uint32_t worldId, content::RenderFrameHost *frame) { - that->setWorldId(frame, worldId); - }, - base::Unretained(this), worldId)); + contents->ForEachRenderFrameHost([this, worldId](content::RenderFrameHost *frame) { + setWorldId(frame, worldId); + }); } WebChannelIPCTransportHost::~WebChannelIPCTransportHost() @@ -50,7 +49,7 @@ void WebChannelIPCTransportHost::sendMessage(const QJsonObject &message) { QJsonDocument doc(message); QByteArray json = doc.toJson(QJsonDocument::Compact); - content::RenderFrameHost *frame = web_contents()->GetMainFrame(); + content::RenderFrameHost *frame = web_contents()->GetPrimaryMainFrame(); qCDebug(log).nospace() << "sending webchannel message to " << frame << ": " << doc; GetWebChannelIPCTransportRemote(frame)->DispatchWebChannelMessage( std::vector<uint8_t>(json.begin(), json.end()), m_worldId); @@ -60,10 +59,9 @@ void WebChannelIPCTransportHost::setWorldId(uint32_t worldId) { if (m_worldId == worldId) return; - web_contents()->ForEachFrame(base::BindRepeating([](WebChannelIPCTransportHost *that, uint32_t worldId, content::RenderFrameHost *frame) { - that->setWorldId(frame, worldId); - }, - base::Unretained(this), worldId)); + web_contents()->ForEachRenderFrameHost([this, worldId](content::RenderFrameHost *frame) { + setWorldId(frame, worldId); + }); m_worldId = worldId; } @@ -77,16 +75,16 @@ void WebChannelIPCTransportHost::setWorldId(content::RenderFrameHost *frame, uin void WebChannelIPCTransportHost::resetWorldId() { - web_contents()->ForEachFrame(base::BindRepeating([](WebChannelIPCTransportHost *that, content::RenderFrameHost *frame) { + web_contents()->ForEachRenderFrameHost([this] (content::RenderFrameHost *frame) { if (!frame->IsRenderFrameLive()) return; - that->GetWebChannelIPCTransportRemote(frame)->ResetWorldId(); - }, this)); + GetWebChannelIPCTransportRemote(frame)->ResetWorldId(); + }); } void WebChannelIPCTransportHost::DispatchWebChannelMessage(const std::vector<uint8_t> &json) { - content::RenderFrameHost *frame = web_contents()->GetMainFrame(); + content::RenderFrameHost *frame = web_contents()->GetPrimaryMainFrame(); if (m_receiver.GetCurrentTargetFrame() != frame) { return; diff --git a/src/core/renderer_host/web_engine_page_host.cpp b/src/core/renderer_host/web_engine_page_host.cpp index 1b9b9863a..ea9b363ea 100644 --- a/src/core/renderer_host/web_engine_page_host.cpp +++ b/src/core/renderer_host/web_engine_page_host.cpp @@ -21,7 +21,7 @@ WebEnginePageHost::WebEnginePageHost(content::WebContents *webContents, void WebEnginePageHost::FetchDocumentMarkup(uint64_t requestId) { - auto &remote = GetWebEnginePageRenderFrame(web_contents()->GetMainFrame()); + auto &remote = GetWebEnginePageRenderFrame(web_contents()->GetPrimaryMainFrame()); remote->FetchDocumentMarkup( requestId, base::BindOnce(&WebEnginePageHost::OnDidFetchDocumentMarkup, base::Unretained(this))); @@ -29,7 +29,7 @@ void WebEnginePageHost::FetchDocumentMarkup(uint64_t requestId) void WebEnginePageHost::FetchDocumentInnerText(uint64_t requestId) { - auto &remote = GetWebEnginePageRenderFrame(web_contents()->GetMainFrame()); + auto &remote = GetWebEnginePageRenderFrame(web_contents()->GetPrimaryMainFrame()); remote->FetchDocumentInnerText(requestId, base::BindOnce(&WebEnginePageHost::OnDidFetchDocumentInnerText, base::Unretained(this))); @@ -53,7 +53,7 @@ void WebEnginePageHost::RenderFrameDeleted(content::RenderFrameHost *render_fram void WebEnginePageHost::SetBackgroundColor(uint32_t color) { - auto &remote = GetWebEnginePageRenderFrame(web_contents()->GetMainFrame()); + auto &remote = GetWebEnginePageRenderFrame(web_contents()->GetPrimaryMainFrame()); remote->SetBackgroundColor(color); } |