![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 101.0.4911.0 * chore: bump chromium in DEPS to 101.0.4913.0 * chore: bump chromium in DEPS to 101.0.4915.0 * chore: bump chromium in DEPS to 101.0.4917.0 * chore: bump chromium in DEPS to 101.0.4919.0 * chore: bump chromium in DEPS to 101.0.4921.0 * chore: bump chromium in DEPS to 101.0.4923.0 * chore: bump chromium in DEPS to 101.0.4925.0 * chore: bump chromium in DEPS to 101.0.4927.0 * chore: bump chromium in DEPS to 101.0.4929.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4931.0 * chore: update patches * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types |1824792
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: reconcile patches with main rebase * chore: bump chromium in DEPS to 101.0.4933.0 * chore: update patches * 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame Ref:3329593
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h Ref:3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags Ref:3499818
* chore: bump chromium in DEPS to 101.0.4935.0 * chore: update patches * 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N) Ref:3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations" Ref:3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types |1880987
The change in the roll started causing the legacy types to fail * chore: missing SkRegion include * 3499600: Introduce blink::WebCssOrigin Ref:3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: bump chromium in DEPS to 101.0.4937.0 * chore: update patches * 3500826: [locales] Refactor locales for ios Ref:3500826
* 3509531: Make some public Blink media files private Ref:3509531
* 3497377: bluetooth: Add BluetoothDevice.forget() Ref:3497377
* chore: bump chromium in DEPS to 101.0.4939.0 * chore: bump chromium in DEPS to 101.0.4941.0 * 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value. Ref:3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf. Ref:3502592
* chore: update patches * fixup! 3502592: Delete PPAPI init/shutdown code in //pdf. * chore: bump chromium in DEPS to 101.0.4943.0 * chore: fix lint, remove unneeded headers * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> * update mojo calls in offscreen patch * update hunspell filenames * chore: bump chromium in DEPS to 101.0.4945.0 * chore: update patches * fix offscreen patch again * chore: bump chromium in DEPS to 101.0.4947.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4949.0 * support unseasoned pdf * update patches * chore: update patches * chore: [IWYU] include missing skia headers * chore: bump chromium in DEPS to 101.0.4951.0 * chore: update patches * 3457645: media: Remove IsKeySystemsUpdateNeeded()3457645
* chore: bump chromium in DEPS to 102.0.4952.2 * chore: update patches * 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage(). Ref:3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download Ref:3508375
* chore: bump chromium in DEPS to 102.0.4953.0 * chore: update patches * 3510189: Harden up drag and drop support across same-process boundaries. Ref:3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/. Ref:3526815
* chore: bump chromium in DEPS to 102.0.4955.0 * build: add af and ur locale to manifests 3498914 [locales] Add af and ur to desktop Ref:3498914
* fixup! build: add af and ur locale to manifests * chore: bump chromium in DEPS to 102.0.4957.0 * 3529090: gin: set JS flags before v8 initialization Xref:3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch * chore: update patches * 3536433: [network] Rename data_path and http_cache_path from _path to _directory. Xref:3536433
* 3111565: Relocated Page.printToPDF implementation to //components Xref:3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback TODO: currently passes a placeholder for job_settings. We have other code paths that inject settings from electron_api_web_contents.cc. Should those be injected here as well? (CC @codebytere) * fixup! 3111565: Relocated Page.printToPDF implementation to //components * fixup! 3111565: Relocated Page.printToPDF implementation to //components * 3520025: Make "libcxx_abi_unstable" not a gn arg Xref:3520025
build: since it is no longer a gn arg, patch it in * chore: change usages of std::vector with const elements (#33373) * chore: bump chromium in DEPS to 102.0.4959.0 * chore: update patches * build: iwyu base/threading/platform_thread.h * 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. Xref:3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager * use gclient_gn_args_from instead of hand-copying * checkout mac on mac * chore: update patches * Revert "checkout mac on mac" This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769. * fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. * fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded() add nogncheck * fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc * Xref:6dfdf79b8c
Xref: https://reviews.llvm.org/D101458 Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and so it must be enumerated in filenames.libcxxabi.gni * 3511268: Remove unused headers from cxx17_backports.h3511268
use std::size instead of base::size * iwyu: SkPaint 3488428: [includes] Fix transitive includes of SkImageEncoder * chore: [IWYU] include missing skia headers * fixup! 3511268: Remove unused headers from cxx17_backports.h * chore: bump chromium in DEPS to 102.0.4961.0 * chore: update patches * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> chore: remove unused #include * fixup! 3510189: Harden up drag and drop support across same-process boundaries. |3510189
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
243 lines
8.2 KiB
C++
243 lines
8.2 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// Most code came from: chrome/browser/chrome_browser_main_posix.cc.
|
|
|
|
#include "shell/browser/electron_browser_main_parts.h"
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <pthread.h>
|
|
#include <signal.h>
|
|
#include <sys/resource.h>
|
|
#include <unistd.h>
|
|
|
|
#include "base/debug/leak_annotations.h"
|
|
#include "base/posix/eintr_wrapper.h"
|
|
#include "base/task/post_task.h"
|
|
#include "base/threading/platform_thread.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "shell/browser/browser.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// See comment in |PreEarlyInitialization()|, where sigaction is called.
|
|
void SIGCHLDHandler(int signal) {}
|
|
|
|
// The OSX fork() implementation can crash in the child process before
|
|
// fork() returns. In that case, the shutdown pipe will still be
|
|
// shared with the parent process. To prevent child crashes from
|
|
// causing parent shutdowns, |g_pipe_pid| is the pid for the process
|
|
// which registered |g_shutdown_pipe_write_fd|.
|
|
// See <http://crbug.com/175341>.
|
|
pid_t g_pipe_pid = -1;
|
|
int g_shutdown_pipe_write_fd = -1;
|
|
int g_shutdown_pipe_read_fd = -1;
|
|
|
|
// Common code between SIG{HUP, INT, TERM}Handler.
|
|
void GracefulShutdownHandler(int signal) {
|
|
// Reinstall the default handler. We had one shot at graceful shutdown.
|
|
struct sigaction action;
|
|
memset(&action, 0, sizeof(action));
|
|
action.sa_handler = SIG_DFL;
|
|
RAW_CHECK(sigaction(signal, &action, nullptr) == 0);
|
|
|
|
RAW_CHECK(g_pipe_pid == getpid());
|
|
RAW_CHECK(g_shutdown_pipe_write_fd != -1);
|
|
RAW_CHECK(g_shutdown_pipe_read_fd != -1);
|
|
size_t bytes_written = 0;
|
|
do {
|
|
int rv = HANDLE_EINTR(
|
|
write(g_shutdown_pipe_write_fd,
|
|
reinterpret_cast<const char*>(&signal) + bytes_written,
|
|
sizeof(signal) - bytes_written));
|
|
RAW_CHECK(rv >= 0);
|
|
bytes_written += rv;
|
|
} while (bytes_written < sizeof(signal));
|
|
}
|
|
|
|
// See comment in |PostCreateMainMessageLoop()|, where sigaction is called.
|
|
void SIGHUPHandler(int signal) {
|
|
RAW_CHECK(signal == SIGHUP);
|
|
GracefulShutdownHandler(signal);
|
|
}
|
|
|
|
// See comment in |PostCreateMainMessageLoop()|, where sigaction is called.
|
|
void SIGINTHandler(int signal) {
|
|
RAW_CHECK(signal == SIGINT);
|
|
GracefulShutdownHandler(signal);
|
|
}
|
|
|
|
// See comment in |PostCreateMainMessageLoop()|, where sigaction is called.
|
|
void SIGTERMHandler(int signal) {
|
|
RAW_CHECK(signal == SIGTERM);
|
|
GracefulShutdownHandler(signal);
|
|
}
|
|
|
|
class ShutdownDetector : public base::PlatformThread::Delegate {
|
|
public:
|
|
explicit ShutdownDetector(
|
|
int shutdown_fd,
|
|
base::OnceCallback<void()> shutdown_callback,
|
|
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
|
|
|
|
// disable copy
|
|
ShutdownDetector(const ShutdownDetector&) = delete;
|
|
ShutdownDetector& operator=(const ShutdownDetector&) = delete;
|
|
|
|
// base::PlatformThread::Delegate:
|
|
void ThreadMain() override;
|
|
|
|
private:
|
|
const int shutdown_fd_;
|
|
base::OnceCallback<void()> shutdown_callback_;
|
|
const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
|
};
|
|
|
|
ShutdownDetector::ShutdownDetector(
|
|
int shutdown_fd,
|
|
base::OnceCallback<void()> shutdown_callback,
|
|
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
|
|
: shutdown_fd_(shutdown_fd),
|
|
shutdown_callback_(std::move(shutdown_callback)),
|
|
task_runner_(task_runner) {
|
|
CHECK_NE(shutdown_fd_, -1);
|
|
CHECK(!shutdown_callback_.is_null());
|
|
CHECK(task_runner_);
|
|
}
|
|
|
|
// These functions are used to help us diagnose crash dumps that happen
|
|
// during the shutdown process.
|
|
NOINLINE void ShutdownFDReadError() {
|
|
// Ensure function isn't optimized away.
|
|
asm("");
|
|
sleep(UINT_MAX);
|
|
}
|
|
|
|
NOINLINE void ShutdownFDClosedError() {
|
|
// Ensure function isn't optimized away.
|
|
asm("");
|
|
sleep(UINT_MAX);
|
|
}
|
|
|
|
NOINLINE void ExitPosted() {
|
|
// Ensure function isn't optimized away.
|
|
asm("");
|
|
sleep(UINT_MAX);
|
|
}
|
|
|
|
void ShutdownDetector::ThreadMain() {
|
|
base::PlatformThread::SetName("CrShutdownDetector");
|
|
|
|
int signal;
|
|
size_t bytes_read = 0;
|
|
do {
|
|
const ssize_t ret = HANDLE_EINTR(
|
|
read(shutdown_fd_, reinterpret_cast<char*>(&signal) + bytes_read,
|
|
sizeof(signal) - bytes_read));
|
|
if (ret < 0) {
|
|
NOTREACHED() << "Unexpected error: " << strerror(errno);
|
|
ShutdownFDReadError();
|
|
break;
|
|
} else if (ret == 0) {
|
|
NOTREACHED() << "Unexpected closure of shutdown pipe.";
|
|
ShutdownFDClosedError();
|
|
break;
|
|
}
|
|
bytes_read += ret;
|
|
} while (bytes_read < sizeof(signal));
|
|
VLOG(1) << "Handling shutdown for signal " << signal << ".";
|
|
|
|
if (!task_runner_->PostTask(FROM_HERE,
|
|
base::BindOnce(std::move(shutdown_callback_)))) {
|
|
// Without a valid task runner to post the exit task to, there aren't many
|
|
// options. Raise the signal again. The default handler will pick it up
|
|
// and cause an ungraceful exit.
|
|
RAW_LOG(WARNING, "No valid task runner, exiting ungracefully.");
|
|
kill(getpid(), signal);
|
|
|
|
// The signal may be handled on another thread. Give that a chance to
|
|
// happen.
|
|
sleep(3);
|
|
|
|
// We really should be dead by now. For whatever reason, we're not. Exit
|
|
// immediately, with the exit status set to the signal number with bit 8
|
|
// set. On the systems that we care about, this exit status is what is
|
|
// normally used to indicate an exit by this signal's default handler.
|
|
// This mechanism isn't a de jure standard, but even in the worst case, it
|
|
// should at least result in an immediate exit.
|
|
RAW_LOG(WARNING, "Still here, exiting really ungracefully.");
|
|
_exit(signal | (1 << 7));
|
|
}
|
|
ExitPosted();
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void ElectronBrowserMainParts::HandleSIGCHLD() {
|
|
// We need to accept SIGCHLD, even though our handler is a no-op because
|
|
// otherwise we cannot wait on children. (According to POSIX 2001.)
|
|
struct sigaction action;
|
|
memset(&action, 0, sizeof(action));
|
|
action.sa_handler = SIGCHLDHandler;
|
|
CHECK_EQ(sigaction(SIGCHLD, &action, nullptr), 0);
|
|
}
|
|
|
|
void ElectronBrowserMainParts::InstallShutdownSignalHandlers(
|
|
base::OnceCallback<void()> shutdown_callback,
|
|
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
|
|
int pipefd[2];
|
|
int ret = pipe(pipefd);
|
|
if (ret < 0) {
|
|
PLOG(DFATAL) << "Failed to create pipe";
|
|
return;
|
|
}
|
|
g_pipe_pid = getpid();
|
|
g_shutdown_pipe_read_fd = pipefd[0];
|
|
g_shutdown_pipe_write_fd = pipefd[1];
|
|
#if !defined(ADDRESS_SANITIZER)
|
|
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
|
#else
|
|
// ASan instrumentation bloats the stack frames, so we need to increase the
|
|
// stack size to avoid hitting the guard page.
|
|
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
|
#endif
|
|
ShutdownDetector* detector = new ShutdownDetector(
|
|
g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
|
|
|
|
// PlatformThread does not delete its delegate.
|
|
ANNOTATE_LEAKING_OBJECT_PTR(detector);
|
|
if (!base::PlatformThread::CreateNonJoinable(kShutdownDetectorThreadStackSize,
|
|
detector)) {
|
|
LOG(DFATAL) << "Failed to create shutdown detector task.";
|
|
}
|
|
// Setup signal handlers for shutdown AFTER shutdown pipe is setup because
|
|
// it may be called right away after handler is set.
|
|
|
|
// If adding to this list of signal handlers, note the new signal probably
|
|
// needs to be reset in child processes. See
|
|
// base/process_util_posix.cc:LaunchProcess.
|
|
|
|
// We need to handle SIGTERM, because that is how many POSIX-based distros
|
|
// ask processes to quit gracefully at shutdown time.
|
|
struct sigaction action;
|
|
memset(&action, 0, sizeof(action));
|
|
action.sa_handler = SIGTERMHandler;
|
|
CHECK_EQ(sigaction(SIGTERM, &action, nullptr), 0);
|
|
|
|
// Also handle SIGINT - when the user terminates the browser via Ctrl+C. If
|
|
// the browser process is being debugged, GDB will catch the SIGINT first.
|
|
action.sa_handler = SIGINTHandler;
|
|
CHECK_EQ(sigaction(SIGINT, &action, nullptr), 0);
|
|
|
|
// And SIGHUP, for when the terminal disappears. On shutdown, many Linux
|
|
// distros send SIGHUP, SIGTERM, and then SIGKILL.
|
|
action.sa_handler = SIGHUPHandler;
|
|
CHECK_EQ(sigaction(SIGHUP, &action, nullptr), 0);
|
|
}
|
|
|
|
} // namespace electron
|