From b6c57f4eeeca503e643cf8b3ddc1ec70bfe75886 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Fri, 16 Jul 2021 13:17:44 +0200 Subject: Remove IPC message logging Doesn't seem to be useful, chromium community doesn't maintain it anymore. Pick-to: 6.2 Change-Id: I24071d6319c258f2d88f3bde5c38dd9fddeec9a8 Reviewed-by: Michal Klocek --- src/core/CMakeLists.txt | 1 - src/core/common/qt_ipc_logging.cpp | 48 ---------------------- src/core/common/qt_messages.h | 6 +-- src/core/core_chromium.pri | 1 - src/core/printing/print_view_manager_base_qt.cpp | 3 +- src/core/renderer/content_renderer_client_qt.cpp | 1 - src/core/renderer/user_resource_controller.cpp | 1 - src/core/renderer/web_channel_ipc_transport.cpp | 2 - .../user_resource_controller_host.cpp | 1 - .../web_channel_ipc_transport_host.cpp | 1 - 10 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 src/core/common/qt_ipc_logging.cpp diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 6e7aab1f2..4575bff9c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -87,7 +87,6 @@ foreach(config ${configs}) clipboard_qt.cpp clipboard_qt.h color_chooser_controller.cpp color_chooser_controller.h color_chooser_controller_p.h color_chooser_qt.cpp color_chooser_qt.h - common/qt_ipc_logging.cpp common/qt_messages.cpp common/qt_messages.h compositor/compositor.cpp compositor/compositor.h compositor/content_gpu_client_qt.cpp compositor/content_gpu_client_qt.h diff --git a/src/core/common/qt_ipc_logging.cpp b/src/core/common/qt_ipc_logging.cpp deleted file mode 100644 index 83eb5a5ad..000000000 --- a/src/core/common/qt_ipc_logging.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ - -#include "ipc/ipc_buildflags.h" // Generated buildflag header - -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED) -#define IPC_MESSAGE_MACROS_LOG_ENABLED -#include "content/public/common/content_ipc_logging.h" -#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ - content::RegisterIPCLogger(msg_id, logger) -#include "common/qt_messages.h" -#endif diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h index ef7ba7f8d..de0257254 100644 --- a/src/core/common/qt_messages.h +++ b/src/core/common/qt_messages.h @@ -4,16 +4,13 @@ // Multiply-included file, no traditional include guard. -#include "base/optional.h" #include "content/public/common/common_param_traits.h" -#include "content/public/common/webplugininfo.h" #include "ipc/ipc_message_macros.h" -#include "ppapi/buildflags/buildflags.h" +#include "url/gurl.h" #define IPC_MESSAGE_START QtMsgStart //----------------------------------------------------------------------------- -// RenderView messages // These are messages sent from the browser to the renderer process. // Tells the renderer whether or not a storage access has been allowed. @@ -22,7 +19,6 @@ IPC_MESSAGE_ROUTED2(QtWebEngineMsg_RequestStorageAccessAsyncResponse, bool /* allowed */) //----------------------------------------------------------------------------- -// Misc messages // These are messages sent from the renderer to the browser process. IPC_SYNC_MESSAGE_CONTROL4_1(QtWebEngineHostMsg_AllowStorageAccess, diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 3459b0ee5..df938232c 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -50,7 +50,6 @@ SOURCES = \ clipboard_qt.cpp \ color_chooser_qt.cpp \ color_chooser_controller.cpp \ - common/qt_ipc_logging.cpp \ common/qt_messages.cpp \ compositor/compositor.cpp \ compositor/content_gpu_client_qt.cpp \ diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp index 9f745a9e0..b8e18e7d7 100644 --- a/src/core/printing/print_view_manager_base_qt.cpp +++ b/src/core/printing/print_view_manager_base_qt.cpp @@ -416,7 +416,8 @@ void PrintViewManagerBaseQt::DidStartLoading() UpdatePrintingEnabled(); } -// Note: In PrintViewManagerQt we always initiate printing with PrintMsg_InitiatePrintPreview +// Note: In PrintViewManagerQt we always initiate printing with +// printing::mojom::PrintRenderFrame::InitiatePrintPreview() // so m_printingRFH is never set and used at the moment. void PrintViewManagerBaseQt::RenderFrameDeleted(content::RenderFrameHost *render_frame_host) { diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index e11f4659b..f52c17dcf 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -78,7 +78,6 @@ #include "renderer/print_web_view_helper_delegate_qt.h" #endif -#include "common/qt_messages.h" #include "renderer/render_frame_observer_qt.h" #include "renderer/web_engine_page_render_frame.h" #include "renderer/render_configuration.h" diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index 459914d9c..029d02c8c 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -55,7 +55,6 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" -#include "common/qt_messages.h" #include "qtwebengine/userscript/user_script_data.h" #include "type_conversion.h" #include "user_script.h" diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp index 1efefc1d0..fff3eb70f 100644 --- a/src/core/renderer/web_channel_ipc_transport.cpp +++ b/src/core/renderer/web_channel_ipc_transport.cpp @@ -42,8 +42,6 @@ #include "renderer/web_channel_ipc_transport.h" -#include "common/qt_messages.h" - #include "content/public/renderer/render_frame.h" #include "gin/arguments.h" #include "gin/handle.h" diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp index 58559848f..387df9452 100644 --- a/src/core/renderer_host/user_resource_controller_host.cpp +++ b/src/core/renderer_host/user_resource_controller_host.cpp @@ -39,7 +39,6 @@ #include "user_resource_controller_host.h" -#include "common/qt_messages.h" #include "type_conversion.h" #include "web_contents_adapter.h" #include "content/public/browser/render_process_host.h" 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 ca6fb895e..43c3347bc 100644 --- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp +++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp @@ -46,7 +46,6 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" #include "services/service_manager/public/cpp/interface_provider.h" #include "qtwebengine/browser/qtwebchannel.mojom.h" -#include "common/qt_messages.h" #include #include -- cgit v1.2.3