d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- 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: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
296 lines
7.5 KiB
C++
296 lines
7.5 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/browser.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/files/file_util.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/path_service.h"
|
|
#include "base/run_loop.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "shell/browser/browser_observer.h"
|
|
#include "shell/browser/electron_browser_main_parts.h"
|
|
#include "shell/browser/login_handler.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/window_list.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/electron_paths.h"
|
|
#include "shell/common/gin_helper/arguments.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// Call |quit| after Chromium is fully started.
|
|
//
|
|
// This is important for quitting immediately in the "ready" event, when
|
|
// certain initialization task may still be pending, and quitting at that time
|
|
// could end up with crash on exit.
|
|
void RunQuitClosure(base::OnceClosure quit) {
|
|
// On Linux/Windows the "ready" event is emitted in "PreMainMessageLoopRun",
|
|
// make sure we quit after message loop has run for once.
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
|
|
std::move(quit));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
Browser::LaunchItem::LaunchItem() = default;
|
|
Browser::LaunchItem::~LaunchItem() = default;
|
|
Browser::LaunchItem::LaunchItem(const LaunchItem& other) = default;
|
|
#endif
|
|
|
|
Browser::LoginItemSettings::LoginItemSettings() = default;
|
|
Browser::LoginItemSettings::~LoginItemSettings() = default;
|
|
Browser::LoginItemSettings::LoginItemSettings(const LoginItemSettings& other) =
|
|
default;
|
|
|
|
Browser::Browser() {
|
|
WindowList::AddObserver(this);
|
|
}
|
|
|
|
Browser::~Browser() {
|
|
WindowList::RemoveObserver(this);
|
|
}
|
|
|
|
// static
|
|
Browser* Browser::Get() {
|
|
return ElectronBrowserMainParts::Get()->browser();
|
|
}
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
|
void Browser::Focus(gin::Arguments* args) {
|
|
// Focus on the first visible window.
|
|
for (auto* const window : WindowList::GetWindows()) {
|
|
if (window->IsVisible()) {
|
|
window->Focus(true);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
void Browser::Quit() {
|
|
if (is_quitting_)
|
|
return;
|
|
|
|
is_quitting_ = HandleBeforeQuit();
|
|
if (!is_quitting_)
|
|
return;
|
|
|
|
if (electron::WindowList::IsEmpty())
|
|
NotifyAndShutdown();
|
|
else
|
|
electron::WindowList::CloseAllWindows();
|
|
}
|
|
|
|
void Browser::Exit(gin::Arguments* args) {
|
|
int code = 0;
|
|
args->GetNext(&code);
|
|
|
|
if (!ElectronBrowserMainParts::Get()->SetExitCode(code)) {
|
|
// Message loop is not ready, quit directly.
|
|
exit(code);
|
|
} else {
|
|
// Prepare to quit when all windows have been closed.
|
|
is_quitting_ = true;
|
|
|
|
// Remember this caller so that we don't emit unrelated events.
|
|
is_exiting_ = true;
|
|
|
|
// Must destroy windows before quitting, otherwise bad things can happen.
|
|
if (electron::WindowList::IsEmpty()) {
|
|
Shutdown();
|
|
} else {
|
|
// Unlike Quit(), we do not ask to close window, but destroy the window
|
|
// without asking.
|
|
electron::WindowList::DestroyAllWindows();
|
|
}
|
|
}
|
|
}
|
|
|
|
void Browser::Shutdown() {
|
|
if (is_shutdown_)
|
|
return;
|
|
|
|
is_shutdown_ = true;
|
|
is_quitting_ = true;
|
|
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnQuit();
|
|
|
|
if (quit_main_message_loop_) {
|
|
RunQuitClosure(std::move(quit_main_message_loop_));
|
|
} else {
|
|
// There is no message loop available so we are in early stage, wait until
|
|
// the quit_main_message_loop_ is available.
|
|
// Exiting now would leave defunct processes behind.
|
|
}
|
|
}
|
|
|
|
std::string Browser::GetVersion() const {
|
|
std::string ret = OverriddenApplicationVersion();
|
|
if (ret.empty())
|
|
ret = GetExecutableFileVersion();
|
|
return ret;
|
|
}
|
|
|
|
void Browser::SetVersion(const std::string& version) {
|
|
OverriddenApplicationVersion() = version;
|
|
}
|
|
|
|
std::string Browser::GetName() const {
|
|
std::string ret = OverriddenApplicationName();
|
|
if (ret.empty())
|
|
ret = GetExecutableFileProductName();
|
|
return ret;
|
|
}
|
|
|
|
void Browser::SetName(const std::string& name) {
|
|
OverriddenApplicationName() = name;
|
|
}
|
|
|
|
int Browser::GetBadgeCount() {
|
|
return badge_count_;
|
|
}
|
|
|
|
bool Browser::OpenFile(const std::string& file_path) {
|
|
bool prevent_default = false;
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnOpenFile(&prevent_default, file_path);
|
|
|
|
return prevent_default;
|
|
}
|
|
|
|
void Browser::OpenURL(const std::string& url) {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnOpenURL(url);
|
|
}
|
|
|
|
void Browser::Activate(bool has_visible_windows) {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnActivate(has_visible_windows);
|
|
}
|
|
|
|
void Browser::WillFinishLaunching() {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnWillFinishLaunching();
|
|
}
|
|
|
|
void Browser::DidFinishLaunching(base::Value::Dict launch_info) {
|
|
// Make sure the userData directory is created.
|
|
ScopedAllowBlockingForElectron allow_blocking;
|
|
base::FilePath user_data;
|
|
if (base::PathService::Get(chrome::DIR_USER_DATA, &user_data)) {
|
|
base::CreateDirectoryAndGetError(user_data, nullptr);
|
|
#if BUILDFLAG(IS_WIN)
|
|
base::SetExtraNoExecuteAllowedPath(chrome::DIR_USER_DATA);
|
|
#endif
|
|
}
|
|
|
|
is_ready_ = true;
|
|
if (ready_promise_) {
|
|
ready_promise_->Resolve();
|
|
}
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnFinishLaunching(launch_info.Clone());
|
|
}
|
|
|
|
v8::Local<v8::Value> Browser::WhenReady(v8::Isolate* isolate) {
|
|
if (!ready_promise_) {
|
|
ready_promise_ = std::make_unique<gin_helper::Promise<void>>(isolate);
|
|
if (is_ready()) {
|
|
ready_promise_->Resolve();
|
|
}
|
|
}
|
|
return ready_promise_->GetHandle();
|
|
}
|
|
|
|
void Browser::OnAccessibilitySupportChanged() {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnAccessibilitySupportChanged();
|
|
}
|
|
|
|
void Browser::PreMainMessageLoopRun() {
|
|
for (BrowserObserver& observer : observers_) {
|
|
observer.OnPreMainMessageLoopRun();
|
|
}
|
|
}
|
|
|
|
void Browser::PreCreateThreads() {
|
|
for (BrowserObserver& observer : observers_) {
|
|
observer.OnPreCreateThreads();
|
|
}
|
|
}
|
|
|
|
void Browser::SetMainMessageLoopQuitClosure(base::OnceClosure quit_closure) {
|
|
if (is_shutdown_)
|
|
RunQuitClosure(std::move(quit_closure));
|
|
else
|
|
quit_main_message_loop_ = std::move(quit_closure);
|
|
}
|
|
|
|
void Browser::NotifyAndShutdown() {
|
|
if (is_shutdown_)
|
|
return;
|
|
|
|
bool prevent_default = false;
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnWillQuit(&prevent_default);
|
|
|
|
if (prevent_default) {
|
|
is_quitting_ = false;
|
|
return;
|
|
}
|
|
|
|
Shutdown();
|
|
}
|
|
|
|
bool Browser::HandleBeforeQuit() {
|
|
bool prevent_default = false;
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnBeforeQuit(&prevent_default);
|
|
|
|
return !prevent_default;
|
|
}
|
|
|
|
void Browser::OnWindowCloseCancelled(NativeWindow* window) {
|
|
if (is_quitting_)
|
|
// Once a beforeunload handler has prevented the closing, we think the quit
|
|
// is cancelled too.
|
|
is_quitting_ = false;
|
|
}
|
|
|
|
void Browser::OnWindowAllClosed() {
|
|
if (is_exiting_) {
|
|
Shutdown();
|
|
} else if (is_quitting_) {
|
|
NotifyAndShutdown();
|
|
} else {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnWindowAllClosed();
|
|
}
|
|
}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
void Browser::NewWindowForTab() {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnNewWindowForTab();
|
|
}
|
|
|
|
void Browser::DidBecomeActive() {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnDidBecomeActive();
|
|
}
|
|
#endif
|
|
|
|
} // namespace electron
|