89117fdd99
* chore: bump chromium in DEPS to 118.0.5951.0 * chore: update printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894 No logic changes, but patch needed to be manually re-applied due to upstream code shear * chore: update port_autofill_colors_to_the_color_pipeline.patch No manual changes; patch applied with fuzz * chore: update patches * chore: bump chromium in DEPS to 118.0.5953.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5955.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5957.0 * chore: update patches * chore: include path of native_web_keyboard_event.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 * chore: remove reference to eextensions/browser/notification-types.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627 * chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code? * chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198 * chore: add auto_pip_setting_helper.[cc,h] to chromium_src build Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277 Exiting upstream code used by chromium_src now depends on this new upstream class * chore: bump chromium in DEPS to 118.0.5959.0 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch manually adjust patch to minor upstream chagnes * chore: update patches * chore: bump chromium in DEPS to 118.0.5961.0 * chore: bump chromium in DEPS to 118.0.5963.0 * chore: update patches * 4780994: Rename various base files to "apple" since iOS uses them too https://chromium-review.googlesource.com/c/chromium/src/+/4780994 * Many files moved from `mac` -> `apple` This commit follows a handful of CLs that simply rename files/symbols to change `mac` to `apple` to signify their use across both macOS and iOS: - 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header - 4790744: Move foundation_util to base/apple, leave a forwarding header - 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header - 4787627: Move and rename macOS+iOS base/ files in PA to "apple" - 4780399: Move OSStatus logging to base/apple - 4787387: Remove forwarding headers - 4781113: Rename message_pump_mac to "apple" because iOS uses it too * fixup minor patch update error A function param got dropped from this patch somewhere earlier * chore: bump chromium in DEPS to 118.0.5965.2 * chore: update patches * 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base:🍎: https://chromium-review.googlesource.com/c/chromium/src/+/4799213 * Fix removed include to BrowserContext In crrev.com/c/4767962 an include to BrowserContext was removed, which was necessary for compilation. This broke only for us because "chrome/browser/profiles/profile.h" includes that class, but we remove all references to profiles. * chore: bump chromium in DEPS to 118.0.5967.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5969.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5971.0 * chore: bump chromium in DEPS to 118.0.5973.0 * chore: update patches * 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper https://chromium-review.googlesource.com/c/chromium/src/+/4772121 * 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate. https://chromium-review.googlesource.com/c/chromium/src/+/4811164 * 4809488: Remove duplicate dnd functionality between Web and Renderer prefs https://chromium-review.googlesource.com/c/chromium/src/+/4809488 Given that this is no longer an option of web preferences, we should consider deprecating this option and then removing it. * chore: bump chromium in DEPS to 118.0.5975.0 * chore: update patches * fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build * Reland "[windows] Remove RegKey::DeleteEmptyKey" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255 * Ensure StrCat means StrCat Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180 * fixup! Remove RegKey::DeleteEmptyKey * Consistently reject large p and large q in DH Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
87 lines
2.5 KiB
C++
87 lines
2.5 KiB
C++
// Copyright (c) 2022 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <cstdlib>
|
|
#include <memory>
|
|
|
|
#include "base/allocator/early_zone_registration_apple.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "electron/fuses.h"
|
|
#include "shell/app/electron_library_main.h"
|
|
#include "shell/app/uv_stdio_fix.h"
|
|
|
|
#if defined(HELPER_EXECUTABLE) && !IS_MAS_BUILD()
|
|
#include <mach-o/dyld.h>
|
|
#include <cstdio>
|
|
|
|
#include "sandbox/mac/seatbelt_exec.h" // nogncheck
|
|
#endif
|
|
|
|
extern "C" {
|
|
// abort_report_np() records the message in a special section that both the
|
|
// system CrashReporter and Crashpad collect in crash reports. Using a Crashpad
|
|
// Annotation would be preferable, but this executable cannot depend on
|
|
// Crashpad directly.
|
|
void abort_report_np(const char* fmt, ...);
|
|
}
|
|
|
|
namespace {
|
|
|
|
bool IsEnvSet(const char* name) {
|
|
char* indicator = getenv(name);
|
|
return indicator && indicator[0] != '\0';
|
|
}
|
|
|
|
#if defined(HELPER_EXECUTABLE) && !IS_MAS_BUILD()
|
|
[[noreturn]] void FatalError(const char* format, ...) {
|
|
va_list valist;
|
|
va_start(valist, format);
|
|
char message[4096];
|
|
if (vsnprintf(message, sizeof(message), format, valist) >= 0) {
|
|
fputs(message, stderr);
|
|
abort_report_np("%s", message);
|
|
}
|
|
va_end(valist);
|
|
abort();
|
|
}
|
|
#endif
|
|
|
|
} // namespace
|
|
|
|
int main(int argc, char* argv[]) {
|
|
partition_alloc::EarlyMallocZoneRegistration();
|
|
FixStdioStreams();
|
|
|
|
if (electron::fuses::IsRunAsNodeEnabled() &&
|
|
IsEnvSet("ELECTRON_RUN_AS_NODE")) {
|
|
return ElectronInitializeICUandStartNode(argc, argv);
|
|
}
|
|
|
|
#if defined(HELPER_EXECUTABLE) && !IS_MAS_BUILD()
|
|
uint32_t exec_path_size = 0;
|
|
int rv = _NSGetExecutablePath(NULL, &exec_path_size);
|
|
if (rv != -1) {
|
|
FatalError("_NSGetExecutablePath: get length failed.");
|
|
}
|
|
|
|
auto exec_path = std::make_unique<char[]>(exec_path_size);
|
|
rv = _NSGetExecutablePath(exec_path.get(), &exec_path_size);
|
|
if (rv != 0) {
|
|
FatalError("_NSGetExecutablePath: get path failed.");
|
|
}
|
|
sandbox::SeatbeltExecServer::CreateFromArgumentsResult seatbelt =
|
|
sandbox::SeatbeltExecServer::CreateFromArguments(exec_path.get(), argc,
|
|
argv);
|
|
if (seatbelt.sandbox_required) {
|
|
if (!seatbelt.server) {
|
|
FatalError("Failed to create seatbelt sandbox server.");
|
|
}
|
|
if (!seatbelt.server->InitializeSandbox()) {
|
|
FatalError("Failed to initialize sandbox.");
|
|
}
|
|
}
|
|
#endif // defined(HELPER_EXECUTABLE) && !IS_MAS_BUILD
|
|
|
|
return ElectronMain(argc, argv);
|
|
}
|