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>
208 lines
7.3 KiB
Text
208 lines
7.3 KiB
Text
// 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/ui/message_box.h"
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include "base/containers/contains.h"
|
|
#include "base/functional/callback.h"
|
|
#include "base/mac/mac_util.h"
|
|
#include "base/mac/scoped_nsobject.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "skia/ext/skia_utils_mac.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
|
|
namespace electron {
|
|
|
|
MessageBoxSettings::MessageBoxSettings() = default;
|
|
MessageBoxSettings::MessageBoxSettings(const MessageBoxSettings&) = default;
|
|
MessageBoxSettings::~MessageBoxSettings() = default;
|
|
|
|
namespace {
|
|
|
|
// <ID, messageBox> map
|
|
std::map<int, NSAlert*>& GetDialogsMap() {
|
|
static base::NoDestructor<std::map<int, NSAlert*>> dialogs;
|
|
return *dialogs;
|
|
}
|
|
|
|
NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
|
|
// Ignore the title; it's the window title on other platforms and ignorable.
|
|
NSAlert* alert = [[NSAlert alloc] init];
|
|
[alert setMessageText:base::SysUTF8ToNSString(settings.message)];
|
|
[alert setInformativeText:base::SysUTF8ToNSString(settings.detail)];
|
|
|
|
switch (settings.type) {
|
|
case MessageBoxType::kInformation:
|
|
alert.alertStyle = NSAlertStyleInformational;
|
|
break;
|
|
case MessageBoxType::kWarning:
|
|
case MessageBoxType::kError:
|
|
// NSWarningAlertStyle shows the app icon while NSAlertStyleCritical
|
|
// shows a warning icon with an app icon badge. Since there is no
|
|
// error variant, lets just use NSAlertStyleCritical.
|
|
alert.alertStyle = NSAlertStyleCritical;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
for (size_t i = 0; i < settings.buttons.size(); ++i) {
|
|
NSString* title = base::SysUTF8ToNSString(settings.buttons[i]);
|
|
// An empty title causes crash on macOS.
|
|
if (settings.buttons[i].empty())
|
|
title = @"(empty)";
|
|
NSButton* button = [alert addButtonWithTitle:title];
|
|
[button setTag:i];
|
|
}
|
|
|
|
NSArray* ns_buttons = [alert buttons];
|
|
int button_count = static_cast<int>([ns_buttons count]);
|
|
|
|
if (settings.default_id >= 0 && settings.default_id < button_count) {
|
|
// The first button added gets set as the default selected, so remove
|
|
// that and set the button @ default_id to be default.
|
|
[[ns_buttons objectAtIndex:0] setKeyEquivalent:@""];
|
|
[[ns_buttons objectAtIndex:settings.default_id] setKeyEquivalent:@"\r"];
|
|
}
|
|
|
|
// Bind cancel id button to escape key if there is more than one button
|
|
if (button_count > 1 && settings.cancel_id >= 0 &&
|
|
settings.cancel_id < button_count) {
|
|
[[ns_buttons objectAtIndex:settings.cancel_id] setKeyEquivalent:@"\e"];
|
|
}
|
|
|
|
// TODO(@codebytere): This behavior violates HIG & should be deprecated.
|
|
if (settings.cancel_id >= 0 && settings.cancel_id == settings.default_id) {
|
|
[[ns_buttons objectAtIndex:settings.default_id] highlight:YES];
|
|
}
|
|
|
|
if (!settings.checkbox_label.empty()) {
|
|
alert.showsSuppressionButton = YES;
|
|
alert.suppressionButton.title =
|
|
base::SysUTF8ToNSString(settings.checkbox_label);
|
|
alert.suppressionButton.state =
|
|
settings.checkbox_checked ? NSOnState : NSOffState;
|
|
}
|
|
|
|
if (!settings.icon.isNull()) {
|
|
NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
|
|
*settings.icon.bitmap(), base::mac::GetGenericRGBColorSpace());
|
|
[alert setIcon:image];
|
|
}
|
|
|
|
if (settings.text_width > 0) {
|
|
NSRect rect = NSMakeRect(0, 0, settings.text_width, 0);
|
|
NSView* accessoryView = [[NSView alloc] initWithFrame:rect];
|
|
[alert setAccessoryView:[accessoryView autorelease]];
|
|
}
|
|
|
|
return alert;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
|
base::scoped_nsobject<NSAlert> alert(CreateNSAlert(settings));
|
|
|
|
// Use runModal for synchronous alert without parent, since we don't have a
|
|
// window to wait for. Also use it when window is provided but it is not
|
|
// shown as it would be impossible to dismiss the alert if it is connected
|
|
// to invisible window (see #22671).
|
|
if (!settings.parent_window || !settings.parent_window->IsVisible())
|
|
return [alert runModal];
|
|
|
|
__block int ret_code = -1;
|
|
|
|
NSWindow* window =
|
|
settings.parent_window->GetNativeWindow().GetNativeNSWindow();
|
|
[alert beginSheetModalForWindow:window
|
|
completionHandler:^(NSModalResponse response) {
|
|
ret_code = response;
|
|
[NSApp stopModal];
|
|
}];
|
|
|
|
[NSApp runModalForWindow:window];
|
|
return ret_code;
|
|
}
|
|
|
|
void ShowMessageBox(const MessageBoxSettings& settings,
|
|
MessageBoxCallback callback) {
|
|
NSAlert* alert = CreateNSAlert(settings);
|
|
|
|
// Use runModal for synchronous alert without parent, since we don't have a
|
|
// window to wait for.
|
|
if (!settings.parent_window) {
|
|
int ret = [[alert autorelease] runModal];
|
|
std::move(callback).Run(ret, alert.suppressionButton.state == NSOnState);
|
|
} else {
|
|
if (settings.id) {
|
|
if (base::Contains(GetDialogsMap(), *settings.id))
|
|
CloseMessageBox(*settings.id);
|
|
GetDialogsMap()[*settings.id] = alert;
|
|
}
|
|
|
|
NSWindow* window =
|
|
settings.parent_window
|
|
? settings.parent_window->GetNativeWindow().GetNativeNSWindow()
|
|
: nil;
|
|
|
|
// Duplicate the callback object here since c is a reference and gcd would
|
|
// only store the pointer, by duplication we can force gcd to store a copy.
|
|
__block MessageBoxCallback callback_ = std::move(callback);
|
|
__block absl::optional<int> id = std::move(settings.id);
|
|
__block int cancel_id = settings.cancel_id;
|
|
|
|
auto handler = ^(NSModalResponse response) {
|
|
if (id)
|
|
GetDialogsMap().erase(*id);
|
|
// When the alert is cancelled programmatically, the response would be
|
|
// something like -1000. This currently only happens when users call
|
|
// CloseMessageBox API, and we should return cancelId as result.
|
|
if (response < 0)
|
|
response = cancel_id;
|
|
bool suppressed = alert.suppressionButton.state == NSOnState;
|
|
[alert release];
|
|
// The completionHandler runs inside a transaction commit, and we should
|
|
// not do any runModal inside it. However since we can not control what
|
|
// users will run in the callback, we have to delay running the callback
|
|
// until next tick, otherwise crash like this may happen:
|
|
// https://github.com/electron/electron/issues/26884
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(std::move(callback_), response, suppressed));
|
|
};
|
|
[alert beginSheetModalForWindow:window completionHandler:handler];
|
|
}
|
|
}
|
|
|
|
void CloseMessageBox(int id) {
|
|
auto it = GetDialogsMap().find(id);
|
|
if (it == GetDialogsMap().end()) {
|
|
LOG(ERROR) << "CloseMessageBox called with nonexistent ID";
|
|
return;
|
|
}
|
|
[NSApp endSheet:it->second.window];
|
|
}
|
|
|
|
void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
|
|
NSAlert* alert = [[NSAlert alloc] init];
|
|
[alert setMessageText:base::SysUTF16ToNSString(title)];
|
|
[alert setInformativeText:base::SysUTF16ToNSString(content)];
|
|
[alert setAlertStyle:NSAlertStyleCritical];
|
|
[alert runModal];
|
|
[alert release];
|
|
}
|
|
|
|
} // namespace electron
|