From 41bc6638304ce38cfad5b00a0c69bf069d0712a3 Mon Sep 17 00:00:00 2001 From: jiangtiantian Date: Sun, 29 Sep 2024 11:08:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=9A=E8=BF=9B=E7=A8=8B]=20adapter=20rende?= =?UTF-8?q?r=20process=E8=AE=BE=E7=BD=AEFDs=E6=B5=81=E7=A8=8B=E7=AE=80?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiangtiantian --- libcef/browser/context.cc | 46 --------------------------------------- 1 file changed, 46 deletions(-) diff --git a/libcef/browser/context.cc b/libcef/browser/context.cc index d4f626cd9..c93051b54 100644 --- a/libcef/browser/context.cc +++ b/libcef/browser/context.cc @@ -45,9 +45,6 @@ #include "services/network/public/mojom/network_service.mojom.h" #include "libcef/browser/download_item_impl.h" -#include "base/posix/global_descriptors.h" -#include "content/public/common/content_descriptors.h" - namespace { CefContext* g_context = nullptr; @@ -304,49 +301,6 @@ int CefExecuteProcess(const CefMainArgs& args, InitInstallDetails(); InitCrashReporter(); #endif - if (windows_sandbox_info == nullptr) { - LOG(ERROR) << __func__ << "no fds data"; - return -1; - } - - std::string fdStr = *static_cast(windows_sandbox_info); - int32_t ipcFd, sharedFd, crashFd; - sscanf(fdStr.c_str(), "%d-%d-%d", &ipcFd, &sharedFd, &crashFd); - - base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); - if (g_fds == nullptr) { - LOG(ERROR) << __func__ << "GlobalDescriptors is null"; - return -1; - } - - int new_ipc_fd; - if ((new_ipc_fd = dup(ipcFd)) < 0) { - LOG(ERROR) << "ipcFd duplicate error"; - g_fds->Set(kMojoIPCChannel, ipcFd); - } else { - g_fds->Set(kMojoIPCChannel, new_ipc_fd); - close(ipcFd); - } - - int new_shared_fd; - if ((new_shared_fd = dup(sharedFd)) < 0) { - LOG(ERROR) << "sharedFd duplicate error"; - g_fds->Set(kFieldTrialDescriptor, sharedFd); - } else { - g_fds->Set(kFieldTrialDescriptor, new_shared_fd); - close(sharedFd); - } - - int new_crash_id; - if ((new_crash_id = dup(crashFd)) < 0) { - LOG(ERROR) << "crashFd duplicate error"; - g_fds->Set(kCrashDumpSignal, crashFd); - } else { - g_fds->Set(kCrashDumpSignal, new_crash_id); - close(crashFd); - } - - windows_sandbox_info = nullptr; return CefMainRunner::RunAsHelperProcess(args, application, windows_sandbox_info); } -- Gitee