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>
263 lines
9.6 KiB
Text
263 lines
9.6 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.
|
|
|
|
#import "shell/browser/api/electron_api_menu_mac.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/mac/scoped_sending_event.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/task/current_thread.h"
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/common/keyboard_util.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace {
|
|
|
|
static scoped_nsobject<NSMenu> applicationMenu_;
|
|
|
|
ui::Accelerator GetAcceleratorFromKeyEquivalentAndModifierMask(
|
|
NSString* key_equivalent,
|
|
NSUInteger modifier_mask) {
|
|
absl::optional<char16_t> shifted_char;
|
|
ui::KeyboardCode code = electron::KeyboardCodeFromStr(
|
|
base::SysNSStringToUTF8(key_equivalent), &shifted_char);
|
|
int modifiers = 0;
|
|
if (modifier_mask & NSEventModifierFlagShift)
|
|
modifiers |= ui::EF_SHIFT_DOWN;
|
|
if (modifier_mask & NSEventModifierFlagControl)
|
|
modifiers |= ui::EF_CONTROL_DOWN;
|
|
if (modifier_mask & NSEventModifierFlagOption)
|
|
modifiers |= ui::EF_ALT_DOWN;
|
|
if (modifier_mask & NSEventModifierFlagCommand)
|
|
modifiers |= ui::EF_COMMAND_DOWN;
|
|
return ui::Accelerator(code, modifiers);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron::api {
|
|
|
|
MenuMac::MenuMac(gin::Arguments* args) : Menu(args) {}
|
|
|
|
MenuMac::~MenuMac() = default;
|
|
|
|
void MenuMac::PopupAt(BaseWindow* window,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
base::OnceClosure callback) {
|
|
NativeWindow* native_window = window->window();
|
|
if (!native_window)
|
|
return;
|
|
|
|
// Make sure the Menu object would not be garbage-collected until the callback
|
|
// has run.
|
|
base::OnceClosure callback_with_ref = BindSelfToClosure(std::move(callback));
|
|
|
|
auto popup =
|
|
base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
|
|
native_window->GetWeakPtr(), window->weak_map_id(), x, y,
|
|
positioning_item, std::move(callback_with_ref));
|
|
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
|
|
std::move(popup));
|
|
}
|
|
|
|
v8::Local<v8::Value> Menu::GetUserAcceleratorAt(int command_id) const {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
if (![NSMenuItem usesUserKeyEquivalents])
|
|
return v8::Null(isolate);
|
|
|
|
auto controller = base::scoped_nsobject<ElectronMenuController>(
|
|
[[ElectronMenuController alloc] initWithModel:model()
|
|
useDefaultAccelerator:NO]);
|
|
|
|
int command_index = GetIndexOfCommandId(command_id);
|
|
if (command_index == -1)
|
|
return v8::Null(isolate);
|
|
|
|
base::scoped_nsobject<NSMenuItem> item =
|
|
[controller makeMenuItemForIndex:command_index fromModel:model()];
|
|
if ([[item userKeyEquivalent] length] == 0)
|
|
return v8::Null(isolate);
|
|
|
|
NSString* user_key_equivalent = [item keyEquivalent];
|
|
NSUInteger user_modifier_mask = [item keyEquivalentModifierMask];
|
|
ui::Accelerator accelerator = GetAcceleratorFromKeyEquivalentAndModifierMask(
|
|
user_key_equivalent, user_modifier_mask);
|
|
|
|
return gin::ConvertToV8(isolate, accelerator.GetShortcutText());
|
|
}
|
|
|
|
void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
|
|
int32_t window_id,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
base::OnceClosure callback) {
|
|
if (!native_window)
|
|
return;
|
|
NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
|
|
|
|
base::OnceClosure close_callback =
|
|
base::BindOnce(&MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id,
|
|
std::move(callback));
|
|
popup_controllers_[window_id] = base::scoped_nsobject<ElectronMenuController>(
|
|
[[ElectronMenuController alloc] initWithModel:model()
|
|
useDefaultAccelerator:NO]);
|
|
NSMenu* menu = [popup_controllers_[window_id] menu];
|
|
NSView* view = [nswindow contentView];
|
|
|
|
// Which menu item to show.
|
|
NSMenuItem* item = nil;
|
|
if (positioning_item < [menu numberOfItems] && positioning_item >= 0)
|
|
item = [menu itemAtIndex:positioning_item];
|
|
|
|
// (-1, -1) means showing on mouse location.
|
|
NSPoint position;
|
|
if (x == -1 || y == -1) {
|
|
position = [view convertPoint:[nswindow mouseLocationOutsideOfEventStream]
|
|
fromView:nil];
|
|
} else {
|
|
position = NSMakePoint(x, [view frame].size.height - y);
|
|
}
|
|
|
|
// If no preferred item is specified, try to show all of the menu items.
|
|
if (!item) {
|
|
CGFloat windowBottom = CGRectGetMinY([view window].frame);
|
|
CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
|
|
CGFloat screenBottom = CGRectGetMinY([view window].screen.visibleFrame);
|
|
CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
|
|
if (distanceFromBottom < 0)
|
|
position.y = position.y - distanceFromBottom + 4;
|
|
}
|
|
|
|
// Place the menu left of cursor if it is overflowing off right of screen.
|
|
CGFloat windowLeft = CGRectGetMinX([view window].frame);
|
|
CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
|
|
CGFloat screenRight = CGRectGetMaxX([view window].screen.visibleFrame);
|
|
if (rightmostMenuPoint > screenRight)
|
|
position.x = position.x - [menu size].width;
|
|
|
|
[popup_controllers_[window_id] setCloseCallback:std::move(close_callback)];
|
|
// Make sure events can be pumped while the menu is up.
|
|
base::CurrentThread::ScopedAllowApplicationTasksInNativeNestedLoop allow;
|
|
|
|
// One of the events that could be pumped is |window.close()|.
|
|
// User-initiated event-tracking loops protect against this by
|
|
// setting flags in -[CrApplication sendEvent:], but since
|
|
// web-content menus are initiated by IPC message the setup has to
|
|
// be done manually.
|
|
base::mac::ScopedSendingEvent sendingEventScoper;
|
|
|
|
// Don't emit unresponsive event when showing menu.
|
|
[menu popUpMenuPositioningItem:item atLocation:position inView:view];
|
|
}
|
|
|
|
void MenuMac::ClosePopupAt(int32_t window_id) {
|
|
auto close_popup = base::BindOnce(&MenuMac::ClosePopupOnUI,
|
|
weak_factory_.GetWeakPtr(), window_id);
|
|
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, std::move(close_popup));
|
|
}
|
|
|
|
std::u16string MenuMac::GetAcceleratorTextAtForTesting(int index) const {
|
|
// A least effort to get the real shortcut text of NSMenuItem, the code does
|
|
// not need to be perfect since it is test only.
|
|
base::scoped_nsobject<ElectronMenuController> controller(
|
|
[[ElectronMenuController alloc] initWithModel:model()
|
|
useDefaultAccelerator:NO]);
|
|
NSMenuItem* item = [[controller menu] itemAtIndex:index];
|
|
std::u16string text;
|
|
NSEventModifierFlags modifiers = [item keyEquivalentModifierMask];
|
|
if (modifiers & NSEventModifierFlagControl)
|
|
text += u"Ctrl";
|
|
if (modifiers & NSEventModifierFlagShift) {
|
|
if (!text.empty())
|
|
text += u"+";
|
|
text += u"Shift";
|
|
}
|
|
if (modifiers & NSEventModifierFlagOption) {
|
|
if (!text.empty())
|
|
text += u"+";
|
|
text += u"Alt";
|
|
}
|
|
if (modifiers & NSEventModifierFlagCommand) {
|
|
if (!text.empty())
|
|
text += u"+";
|
|
text += u"Command";
|
|
}
|
|
if (!text.empty())
|
|
text += u"+";
|
|
auto key = base::ToUpperASCII(base::SysNSStringToUTF16([item keyEquivalent]));
|
|
if (key == u"\t")
|
|
text += u"Tab";
|
|
else
|
|
text += key;
|
|
return text;
|
|
}
|
|
|
|
void MenuMac::ClosePopupOnUI(int32_t window_id) {
|
|
auto controller = popup_controllers_.find(window_id);
|
|
if (controller != popup_controllers_.end()) {
|
|
// Close the controller for the window.
|
|
[controller->second cancel];
|
|
} else if (window_id == -1) {
|
|
// Or just close all opened controllers.
|
|
for (auto it = popup_controllers_.begin();
|
|
it != popup_controllers_.end();) {
|
|
// The iterator is invalidated after the call.
|
|
[(it++)->second cancel];
|
|
}
|
|
}
|
|
}
|
|
|
|
void MenuMac::OnClosed(int32_t window_id, base::OnceClosure callback) {
|
|
popup_controllers_.erase(window_id);
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
// static
|
|
void Menu::SetApplicationMenu(Menu* base_menu) {
|
|
MenuMac* menu = static_cast<MenuMac*>(base_menu);
|
|
base::scoped_nsobject<ElectronMenuController> menu_controller(
|
|
[[ElectronMenuController alloc] initWithModel:menu->model_.get()
|
|
useDefaultAccelerator:YES]);
|
|
|
|
NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
|
|
[currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
|
|
target:NSApp
|
|
argument:applicationMenu_];
|
|
applicationMenu_.reset([[menu_controller menu] retain]);
|
|
[[NSRunLoop currentRunLoop]
|
|
performSelector:@selector(setMainMenu:)
|
|
target:NSApp
|
|
argument:applicationMenu_
|
|
order:0
|
|
modes:[NSArray arrayWithObject:NSDefaultRunLoopMode]];
|
|
|
|
// Ensure the menu_controller_ is destroyed after main menu is set.
|
|
menu_controller.swap(menu->menu_controller_);
|
|
}
|
|
|
|
// static
|
|
void Menu::SendActionToFirstResponder(const std::string& action) {
|
|
SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
|
|
[NSApp sendAction:selector to:nil from:[NSApp mainMenu]];
|
|
}
|
|
|
|
// static
|
|
gin::Handle<Menu> Menu::New(gin::Arguments* args) {
|
|
auto handle =
|
|
gin::CreateHandle(args->isolate(), static_cast<Menu*>(new MenuMac(args)));
|
|
gin_helper::CallMethod(args->isolate(), handle.get(), "_init");
|
|
return handle;
|
|
}
|
|
|
|
} // namespace electron::api
|