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>
259 lines
8.4 KiB
C++
259 lines
8.4 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.
|
|
|
|
#include "shell/browser/ui/message_box.h"
|
|
|
|
#include <map>
|
|
|
|
#include "base/containers/contains.h"
|
|
#include "base/functional/callback.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "electron/electron_gtk_stubs.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/native_window_observer.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "shell/browser/ui/gtk_util.h"
|
|
#include "ui/base/glib/glib_signal.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
#include "ui/gtk/gtk_ui.h" // nogncheck
|
|
#include "ui/gtk/gtk_util.h" // nogncheck
|
|
|
|
#if defined(USE_OZONE)
|
|
#include "ui/base/ui_base_features.h"
|
|
#endif
|
|
|
|
#define ANSI_FOREGROUND_RED "\x1b[31m"
|
|
#define ANSI_FOREGROUND_BLACK "\x1b[30m"
|
|
#define ANSI_TEXT_BOLD "\x1b[1m"
|
|
#define ANSI_BACKGROUND_GRAY "\x1b[47m"
|
|
#define ANSI_RESET "\x1b[0m"
|
|
|
|
namespace electron {
|
|
|
|
MessageBoxSettings::MessageBoxSettings() = default;
|
|
MessageBoxSettings::MessageBoxSettings(const MessageBoxSettings&) = default;
|
|
MessageBoxSettings::~MessageBoxSettings() = default;
|
|
|
|
namespace {
|
|
|
|
// <ID, messageBox> map
|
|
std::map<int, GtkWidget*>& GetDialogsMap() {
|
|
static base::NoDestructor<std::map<int, GtkWidget*>> dialogs;
|
|
return *dialogs;
|
|
}
|
|
|
|
class GtkMessageBox : public NativeWindowObserver {
|
|
public:
|
|
explicit GtkMessageBox(const MessageBoxSettings& settings)
|
|
: id_(settings.id),
|
|
cancel_id_(settings.cancel_id),
|
|
parent_(static_cast<NativeWindow*>(settings.parent_window)) {
|
|
// Create dialog.
|
|
dialog_ =
|
|
gtk_message_dialog_new(nullptr, // parent
|
|
static_cast<GtkDialogFlags>(0), // no flags
|
|
GetMessageType(settings.type), // type
|
|
GTK_BUTTONS_NONE, // no buttons
|
|
"%s", settings.message.c_str());
|
|
if (id_)
|
|
GetDialogsMap()[*id_] = dialog_;
|
|
if (!settings.detail.empty())
|
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_),
|
|
"%s", settings.detail.c_str());
|
|
if (!settings.title.empty())
|
|
gtk_window_set_title(GTK_WINDOW(dialog_), settings.title.c_str());
|
|
|
|
if (!settings.icon.isNull()) {
|
|
// No easy way to obtain this programmatically, but GTK+'s docs
|
|
// define GTK_ICON_SIZE_DIALOG to be 48 pixels
|
|
static constexpr int pixel_width = 48;
|
|
static constexpr int pixel_height = 48;
|
|
GdkPixbuf* pixbuf =
|
|
gtk_util::GdkPixbufFromSkBitmap(*settings.icon.bitmap());
|
|
GdkPixbuf* scaled_pixbuf = gdk_pixbuf_scale_simple(
|
|
pixbuf, pixel_width, pixel_height, GDK_INTERP_BILINEAR);
|
|
GtkWidget* w = gtk_image_new_from_pixbuf(scaled_pixbuf);
|
|
gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(dialog_), w);
|
|
gtk_widget_show(w);
|
|
g_clear_pointer(&scaled_pixbuf, g_object_unref);
|
|
g_clear_pointer(&pixbuf, g_object_unref);
|
|
}
|
|
|
|
if (!settings.checkbox_label.empty()) {
|
|
GtkWidget* message_area =
|
|
gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog_));
|
|
GtkWidget* check_button =
|
|
gtk_check_button_new_with_label(settings.checkbox_label.c_str());
|
|
g_signal_connect(check_button, "toggled",
|
|
G_CALLBACK(OnCheckboxToggledThunk), this);
|
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button),
|
|
settings.checkbox_checked);
|
|
gtk_container_add(GTK_CONTAINER(message_area), check_button);
|
|
gtk_widget_show(check_button);
|
|
}
|
|
|
|
// Add buttons.
|
|
GtkDialog* dialog = GTK_DIALOG(dialog_);
|
|
if (settings.buttons.size() == 0) {
|
|
gtk_dialog_add_button(dialog, TranslateToStock(0, "OK"), 0);
|
|
} else {
|
|
for (size_t i = 0; i < settings.buttons.size(); ++i) {
|
|
gtk_dialog_add_button(dialog, TranslateToStock(i, settings.buttons[i]),
|
|
i);
|
|
}
|
|
}
|
|
gtk_dialog_set_default_response(dialog, settings.default_id);
|
|
|
|
// Parent window.
|
|
if (parent_) {
|
|
parent_->AddObserver(this);
|
|
static_cast<NativeWindowViews*>(parent_)->SetEnabled(false);
|
|
gtk::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
|
|
gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
|
|
}
|
|
}
|
|
|
|
~GtkMessageBox() override {
|
|
gtk_widget_destroy(dialog_);
|
|
if (parent_) {
|
|
parent_->RemoveObserver(this);
|
|
static_cast<NativeWindowViews*>(parent_)->SetEnabled(true);
|
|
}
|
|
}
|
|
|
|
// disable copy
|
|
GtkMessageBox(const GtkMessageBox&) = delete;
|
|
GtkMessageBox& operator=(const GtkMessageBox&) = delete;
|
|
|
|
GtkMessageType GetMessageType(MessageBoxType type) {
|
|
switch (type) {
|
|
case MessageBoxType::kInformation:
|
|
return GTK_MESSAGE_INFO;
|
|
case MessageBoxType::kWarning:
|
|
return GTK_MESSAGE_WARNING;
|
|
case MessageBoxType::kQuestion:
|
|
return GTK_MESSAGE_QUESTION;
|
|
case MessageBoxType::kError:
|
|
return GTK_MESSAGE_ERROR;
|
|
default:
|
|
return GTK_MESSAGE_OTHER;
|
|
}
|
|
}
|
|
|
|
const char* TranslateToStock(int id, const std::string& text) {
|
|
const std::string lower = base::ToLowerASCII(text);
|
|
if (lower == "cancel")
|
|
return gtk_util::GetCancelLabel();
|
|
if (lower == "no")
|
|
return gtk_util::GetNoLabel();
|
|
if (lower == "ok")
|
|
return gtk_util::GetOkLabel();
|
|
if (lower == "yes")
|
|
return gtk_util::GetYesLabel();
|
|
return text.c_str();
|
|
}
|
|
|
|
void Show() {
|
|
gtk_widget_show(dialog_);
|
|
gtk::GtkUi::GetPlatform()->ShowGtkWindow(GTK_WINDOW(dialog_));
|
|
}
|
|
|
|
int RunSynchronous() {
|
|
Show();
|
|
int response = gtk_dialog_run(GTK_DIALOG(dialog_));
|
|
return (response < 0) ? cancel_id_ : response;
|
|
}
|
|
|
|
void RunAsynchronous(MessageBoxCallback callback) {
|
|
callback_ = std::move(callback);
|
|
|
|
g_signal_connect(dialog_, "delete-event",
|
|
G_CALLBACK(gtk_widget_hide_on_delete), nullptr);
|
|
g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseDialogThunk),
|
|
this);
|
|
Show();
|
|
}
|
|
|
|
void OnWindowClosed() override {
|
|
parent_->RemoveObserver(this);
|
|
parent_ = nullptr;
|
|
}
|
|
|
|
CHROMEG_CALLBACK_1(GtkMessageBox, void, OnResponseDialog, GtkWidget*, int);
|
|
CHROMEG_CALLBACK_0(GtkMessageBox, void, OnCheckboxToggled, GtkWidget*);
|
|
|
|
private:
|
|
// The id of the dialog.
|
|
absl::optional<int> id_;
|
|
|
|
// The id to return when the dialog is closed without pressing buttons.
|
|
int cancel_id_ = 0;
|
|
|
|
bool checkbox_checked_ = false;
|
|
|
|
NativeWindow* parent_;
|
|
GtkWidget* dialog_;
|
|
MessageBoxCallback callback_;
|
|
};
|
|
|
|
void GtkMessageBox::OnResponseDialog(GtkWidget* widget, int response) {
|
|
if (id_)
|
|
GetDialogsMap().erase(*id_);
|
|
gtk_widget_hide(dialog_);
|
|
|
|
if (response < 0)
|
|
std::move(callback_).Run(cancel_id_, checkbox_checked_);
|
|
else
|
|
std::move(callback_).Run(response, checkbox_checked_);
|
|
delete this;
|
|
}
|
|
|
|
void GtkMessageBox::OnCheckboxToggled(GtkWidget* widget) {
|
|
checkbox_checked_ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
|
return GtkMessageBox(settings).RunSynchronous();
|
|
}
|
|
|
|
void ShowMessageBox(const MessageBoxSettings& settings,
|
|
MessageBoxCallback callback) {
|
|
if (settings.id && base::Contains(GetDialogsMap(), *settings.id))
|
|
CloseMessageBox(*settings.id);
|
|
(new GtkMessageBox(settings))->RunAsynchronous(std::move(callback));
|
|
}
|
|
|
|
void CloseMessageBox(int id) {
|
|
auto it = GetDialogsMap().find(id);
|
|
if (it == GetDialogsMap().end()) {
|
|
LOG(ERROR) << "CloseMessageBox called with nonexistent ID";
|
|
return;
|
|
}
|
|
gtk_window_close(GTK_WINDOW(it->second));
|
|
}
|
|
|
|
void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
|
|
if (Browser::Get()->is_ready()) {
|
|
electron::MessageBoxSettings settings;
|
|
settings.type = electron::MessageBoxType::kError;
|
|
settings.buttons = {};
|
|
settings.title = "Error";
|
|
settings.message = base::UTF16ToUTF8(title);
|
|
settings.detail = base::UTF16ToUTF8(content);
|
|
|
|
GtkMessageBox(settings).RunSynchronous();
|
|
} else {
|
|
fprintf(stderr,
|
|
ANSI_TEXT_BOLD ANSI_BACKGROUND_GRAY ANSI_FOREGROUND_RED
|
|
"%s\n" ANSI_FOREGROUND_BLACK "%s" ANSI_RESET "\n",
|
|
base::UTF16ToUTF8(title).c_str(),
|
|
base::UTF16ToUTF8(content).c_str());
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|