1 files changed, 13 insertions, 51 deletions

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 90c86a758..0824ed56d 100644
--- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp
+++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "web_channel_ipc_transport_host.h"
 
@@ -66,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()
@@ -86,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);
@@ -96,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;
 }
 
@@ -113,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;