mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
047e8f9349
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
207 lines
7.1 KiB
Diff
207 lines
7.1 KiB
Diff
diff --git base/memory/shared_memory_hooks.h base/memory/shared_memory_hooks.h
|
|
index 4404b54c22a4..fa3138003032 100644
|
|
--- base/memory/shared_memory_hooks.h
|
|
+++ base/memory/shared_memory_hooks.h
|
|
@@ -24,7 +24,7 @@ class SharedMemoryHooks {
|
|
|
|
private:
|
|
friend class SharedMemoryHooksTest;
|
|
- friend int service_manager::Main(const service_manager::MainParams&);
|
|
+ friend int service_manager::MainInitialize(service_manager::MainParams&);
|
|
|
|
// Allows shared memory region creation to be hooked. Useful for sandboxed
|
|
// processes that are restricted from invoking the platform APIs directly.
|
|
diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
|
|
index b338bbff49ff..a0645251504b 100644
|
|
--- services/service_manager/embedder/main.cc
|
|
+++ services/service_manager/embedder/main.cc
|
|
@@ -244,22 +244,36 @@ int RunService(MainDelegate* delegate) {
|
|
return 0;
|
|
}
|
|
|
|
+ProcessType GetProcessType(MainDelegate* delegate,
|
|
+ const base::CommandLine& command_line) {
|
|
+ ProcessType process_type = delegate->OverrideProcessType();
|
|
+ if (process_type == ProcessType::kDefault) {
|
|
+ const std::string& type_switch =
|
|
+ command_line.GetSwitchValueASCII(switches::kProcessType);
|
|
+ if (type_switch == switches::kProcessTypeServiceManager) {
|
|
+ process_type = ProcessType::kServiceManager;
|
|
+ } else if (type_switch == switches::kProcessTypeService) {
|
|
+ process_type = ProcessType::kService;
|
|
+ } else {
|
|
+ process_type = ProcessType::kEmbedder;
|
|
+ }
|
|
+ }
|
|
+ return process_type;
|
|
+}
|
|
+
|
|
} // namespace
|
|
|
|
MainParams::MainParams(MainDelegate* delegate) : delegate(delegate) {}
|
|
|
|
MainParams::~MainParams() {}
|
|
|
|
-int Main(const MainParams& params) {
|
|
+int MainInitialize(MainParams& params) {
|
|
MainDelegate* delegate = params.delegate;
|
|
DCHECK(delegate);
|
|
|
|
int exit_code = -1;
|
|
base::debug::GlobalActivityTracker* tracker = nullptr;
|
|
ProcessType process_type = delegate->OverrideProcessType();
|
|
-#if defined(OS_MACOSX)
|
|
- std::unique_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool;
|
|
-#endif
|
|
|
|
// A flag to indicate whether Main() has been called before. On Android, we
|
|
// may re-run Main() without restarting the browser process. This flag
|
|
@@ -345,12 +359,7 @@ int Main(const MainParams& params) {
|
|
MainDelegate::InitializeParams init_params;
|
|
|
|
#if defined(OS_MACOSX)
|
|
- // We need this pool for all the objects created before we get to the event
|
|
- // loop, but we don't want to leave them hanging around until the app quits.
|
|
- // Each "main" needs to flush this pool right before it goes into its main
|
|
- // event loop to get rid of the cruft.
|
|
- autorelease_pool = std::make_unique<base::mac::ScopedNSAutoreleasePool>();
|
|
- init_params.autorelease_pool = autorelease_pool.get();
|
|
+ init_params.autorelease_pool = params.autorelease_pool.get();
|
|
InitializeMac();
|
|
#endif
|
|
|
|
@@ -423,18 +432,16 @@ int Main(const MainParams& params) {
|
|
}
|
|
}
|
|
|
|
+ return exit_code;
|
|
+}
|
|
+
|
|
+int MainRun(MainParams& params) {
|
|
+ MainDelegate* delegate = params.delegate;
|
|
+ DCHECK(delegate);
|
|
+
|
|
+ int exit_code = 0;
|
|
const auto& command_line = *base::CommandLine::ForCurrentProcess();
|
|
- if (process_type == ProcessType::kDefault) {
|
|
- std::string type_switch =
|
|
- command_line.GetSwitchValueASCII(switches::kProcessType);
|
|
- if (type_switch == switches::kProcessTypeServiceManager) {
|
|
- process_type = ProcessType::kServiceManager;
|
|
- } else if (type_switch == switches::kProcessTypeService) {
|
|
- process_type = ProcessType::kService;
|
|
- } else {
|
|
- process_type = ProcessType::kEmbedder;
|
|
- }
|
|
- }
|
|
+ const ProcessType process_type = GetProcessType(delegate, command_line);
|
|
switch (process_type) {
|
|
case ProcessType::kDefault:
|
|
NOTREACHED();
|
|
@@ -456,6 +463,8 @@ int Main(const MainParams& params) {
|
|
break;
|
|
}
|
|
|
|
+ base::debug::GlobalActivityTracker* tracker =
|
|
+ base::debug::GlobalActivityTracker::Get();
|
|
if (tracker) {
|
|
if (exit_code == 0) {
|
|
tracker->SetProcessPhaseIfEnabled(
|
|
@@ -467,13 +476,38 @@ int Main(const MainParams& params) {
|
|
}
|
|
}
|
|
|
|
+ return exit_code;
|
|
+}
|
|
+
|
|
+void MainShutdown(MainParams& params) {
|
|
+ MainDelegate* delegate = params.delegate;
|
|
+ DCHECK(delegate);
|
|
+
|
|
#if defined(OS_MACOSX)
|
|
- autorelease_pool.reset();
|
|
+ params.autorelease_pool.reset();
|
|
#endif
|
|
|
|
+ const ProcessType process_type =
|
|
+ GetProcessType(delegate, *base::CommandLine::ForCurrentProcess());
|
|
if (process_type == ProcessType::kEmbedder)
|
|
delegate->ShutDownEmbedderProcess();
|
|
+}
|
|
+
|
|
+int Main(MainParams& params) {
|
|
+#if defined(OS_MACOSX)
|
|
+ // We need this pool for all the objects created before we get to the event
|
|
+ // loop, but we don't want to leave them hanging around until the app quits.
|
|
+ // Each "main" needs to flush this pool right before it goes into its main
|
|
+ // event loop to get rid of the cruft.
|
|
+ params.autorelease_pool =
|
|
+ std::make_unique<base::mac::ScopedNSAutoreleasePool>();
|
|
+#endif
|
|
|
|
+ int exit_code = MainInitialize(params);
|
|
+ if (exit_code >= 0)
|
|
+ return exit_code;
|
|
+ exit_code = MainRun(params);
|
|
+ MainShutdown(params);
|
|
return exit_code;
|
|
}
|
|
|
|
diff --git services/service_manager/embedder/main.h services/service_manager/embedder/main.h
|
|
index 57e88aa85dfe..5ed6ec2abfda 100644
|
|
--- services/service_manager/embedder/main.h
|
|
+++ services/service_manager/embedder/main.h
|
|
@@ -5,9 +5,15 @@
|
|
#ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_MAIN_H_
|
|
#define SERVICES_SERVICE_MANAGER_EMBEDDER_MAIN_H_
|
|
|
|
+#include <memory>
|
|
+
|
|
#include "base/component_export.h"
|
|
#include "build/build_config.h"
|
|
|
|
+#if defined(OS_MACOSX)
|
|
+#include "base/mac/scoped_nsautorelease_pool.h"
|
|
+#endif // defined(OS_MACOSX)
|
|
+
|
|
namespace service_manager {
|
|
|
|
class MainDelegate;
|
|
@@ -22,11 +28,22 @@ struct COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) MainParams {
|
|
int argc = 0;
|
|
const char** argv = nullptr;
|
|
#endif
|
|
+
|
|
+#if defined(OS_MACOSX)
|
|
+ std::unique_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool;
|
|
+#endif
|
|
};
|
|
|
|
+// Split Main() into separate stages.
|
|
+int COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER)
|
|
+ MainInitialize(MainParams& params);
|
|
+int COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) MainRun(MainParams& params);
|
|
+void COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER)
|
|
+ MainShutdown(MainParams& params);
|
|
+
|
|
// Main function which should be called as early as possible by any executable
|
|
// embedding the service manager.
|
|
-int COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) Main(const MainParams& params);
|
|
+int COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) Main(MainParams& params);
|
|
|
|
} // namespace service_manager
|
|
|
|
diff --git services/service_manager/embedder/set_process_title.cc services/service_manager/embedder/set_process_title.cc
|
|
index 1dc53b847ef9..5432ab02a088 100644
|
|
--- services/service_manager/embedder/set_process_title.cc
|
|
+++ services/service_manager/embedder/set_process_title.cc
|
|
@@ -44,7 +44,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
|
|
bool have_argv0 = false;
|
|
|
|
#if defined(OS_LINUX)
|
|
- DCHECK_EQ(base::PlatformThread::CurrentId(), getpid());
|
|
+ //DCHECK_EQ(base::PlatformThread::CurrentId(), getpid());
|
|
|
|
if (main_argv)
|
|
setproctitle_init(main_argv);
|