mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- 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: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
284 lines
7.3 KiB
C++
284 lines
7.3 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/path_service.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "gin/arguments.h"
|
|
#include "shell/browser/browser_observer.h"
|
|
#include "shell/browser/electron_browser_main_parts.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/window_list.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/gin_converters/login_item_settings_converter.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
|
|
namespace electron {
|
|
|
|
LoginItemSettings::LoginItemSettings() = default;
|
|
LoginItemSettings::~LoginItemSettings() = default;
|
|
LoginItemSettings::LoginItemSettings(const LoginItemSettings& other) = default;
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
LaunchItem::LaunchItem() = default;
|
|
LaunchItem::~LaunchItem() = default;
|
|
LaunchItem::LaunchItem(const LaunchItem& other) = default;
|
|
#endif
|
|
|
|
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
|
|
|
|
Browser::Browser() {
|
|
WindowList::AddObserver(this);
|
|
}
|
|
|
|
Browser::~Browser() {
|
|
WindowList::RemoveObserver(this);
|
|
}
|
|
|
|
void Browser::AddObserver(BrowserObserver* obs) {
|
|
observers_.AddObserver(obs);
|
|
}
|
|
|
|
void Browser::RemoveObserver(BrowserObserver* obs) {
|
|
observers_.RemoveObserver(obs);
|
|
}
|
|
|
|
// 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;
|
|
|
|
observers_.Notify(&BrowserObserver::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;
|
|
}
|
|
|
|
bool Browser::OpenFile(const std::string& file_path) {
|
|
bool prevent_default = false;
|
|
observers_.Notify(&BrowserObserver::OnOpenFile, &prevent_default, file_path);
|
|
return prevent_default;
|
|
}
|
|
|
|
void Browser::OpenURL(const std::string& url) {
|
|
observers_.Notify(&BrowserObserver::OnOpenURL, url);
|
|
}
|
|
|
|
void Browser::Activate(bool has_visible_windows) {
|
|
observers_.Notify(&BrowserObserver::OnActivate, has_visible_windows);
|
|
}
|
|
|
|
void Browser::WillFinishLaunching() {
|
|
observers_.Notify(&BrowserObserver::OnWillFinishLaunching);
|
|
}
|
|
|
|
void Browser::DidFinishLaunching(base::DictValue 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() {
|
|
observers_.Notify(&BrowserObserver::OnAccessibilitySupportChanged);
|
|
}
|
|
|
|
void Browser::PreMainMessageLoopRun() {
|
|
observers_.Notify(&BrowserObserver::OnPreMainMessageLoopRun);
|
|
}
|
|
|
|
void Browser::PreCreateThreads() {
|
|
observers_.Notify(&BrowserObserver::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;
|
|
observers_.Notify(&BrowserObserver::OnWillQuit, &prevent_default);
|
|
if (prevent_default) {
|
|
is_quitting_ = false;
|
|
return;
|
|
}
|
|
|
|
Shutdown();
|
|
}
|
|
|
|
bool Browser::HandleBeforeQuit() {
|
|
bool prevent_default = false;
|
|
observers_.Notify(&BrowserObserver::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 {
|
|
observers_.Notify(&BrowserObserver::OnWindowAllClosed);
|
|
}
|
|
}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
void Browser::NewWindowForTab() {
|
|
observers_.Notify(&BrowserObserver::OnNewWindowForTab);
|
|
}
|
|
|
|
void Browser::DidBecomeActive() {
|
|
observers_.Notify(&BrowserObserver::OnDidBecomeActive);
|
|
}
|
|
|
|
void Browser::DidResignActive() {
|
|
observers_.Notify(&BrowserObserver::OnDidResignActive);
|
|
}
|
|
#endif
|
|
|
|
} // namespace electron
|