mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 116.0.5817.0 (main) (#38465)

Browse source 
* chore: bump chromium in DEPS to 116.0.5793.3

* chore: update patches

* chore: bump chromium in DEPS to 116.0.5795.0

* chore: update patches

* chore: bump chromium in DEPS to 116.0.5797.0

* chore: update patches

* chore: bump chromium in DEPS to 116.0.5799.0

* 4522192: [serial] Allow Bluetooth ports to be requested by service class ID. | 4522192

* 4545385: Create base:🍎:Owned[frameworktype], use it for gfx::NativeEvent | 4545385

* chore: bump chromium in DEPS to 116.0.5801.0

* chore: update patches

* 4562796: Use base:🍎:Owned[frameworktype] for ui::PlatformEvent | 4562796

* 4559790: Manual raw_ptr rewrite: //base | 4559790

* chore: bump chromium in DEPS to 116.0.5803.0

* chore: update patches

* chore: bump chromium in DEPS to 116.0.5805.2

* chore: update patches

* 4547630: Move content/public/common/network_service_util.h to c/p/browser/ | 4547630

* 4510075: Adding extensions to network response experiment | 4510075

* 4566552: Auto-generate grd file for chrome://accessibility. | 4566552

* chore: bump chromium in DEPS to 116.0.5807.0

* chore: update patches

* 4533536: [Privacy Hub] Geolocation manager used directly | 4533536

* chore: patch out ARC support from /chrome/browser

4571955: Convert /chrome/browser to use ARC | 4571955

* chore: bump chromium in DEPS to 116.0.5809.2

* chore: bump chromium in DEPS to 116.0.5811.0

* chore: update patches

* 4573627: Adopt base::NoDestructor for KeyedService factories | 4573627

* 4576878: Reland "Shared Storage: Add mojo method for observing response headers" | 4576878

* chore: bump chromium in DEPS to 116.0.5813.0

* chore: update patches

* fixup! 4566552: Auto-generate grd file for chrome://accessibility. | 4566552

* chore: fix up lint

* test: (debug) use Promise.all in asan tests

* chore: manually roll DEPS to 116.0.5815.0

* chore: update patches

* 4585150: Convert /printing to use ARC | 4585150

* test: (asan) extend timeout, clean up debugging

* chore: remove ARC chromium patch

* chore: update patches after main sync

* 4546398: Convert /chrome/browser to use ARC | 4546398

* build: add chrome_lib_arc for chromium_src/BUILD.gn sources

* fixup! 4559790: Manual raw_ptr rewrite: //base | 4559790

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-06-09 16:08:36 -07:00 • committed by GitHub
parent a3448376a1
commit fd5e6fbc14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 459 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/browser/api/electron_api_web_contents_mac.mm
View file

@ -53,8 +53,9 @@ bool WebContents::PlatformHandleKeyboardEvent(
if (web_preferences && web_preferences->ShouldIgnoreMenuShortcuts())
return false;
NSEvent* ns_event = event.os_event.Get();
// Send the event to the menu before sending it to the window
if (event.os_event.type == NSEventTypeKeyDown) {
if (ns_event.type == NSEventTypeKeyDown) {
// If the keyboard event is a system shortcut, it's already sent to the
// NSMenu instance in
// content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm via
@ -62,33 +63,32 @@ bool WebContents::PlatformHandleKeyboardEvent(
// NSMenu handle it here as well, it'll be sent twice with unexpected side
// effects.
bool is_a_keyboard_shortcut_event =
[[NSApp mainMenu] cr_menuItemForKeyEquivalentEvent:event.os_event] !=
nil;
[[NSApp mainMenu] cr_menuItemForKeyEquivalentEvent:ns_event] != nil;
bool is_a_system_shortcut_event =
is_a_keyboard_shortcut_event &&
(ui::cocoa::ModifierMaskForKeyEvent(event.os_event) &
(ui::cocoa::ModifierMaskForKeyEvent(ns_event) &
NSEventModifierFlagFunction) != 0;
if (is_a_system_shortcut_event)
return false;
if ([[NSApp mainMenu] performKeyEquivalent:event.os_event])
if ([[NSApp mainMenu] performKeyEquivalent:ns_event])
return true;
}
// Let the window redispatch the OS event
if (event.os_event.window &&
[event.os_event.window isKindOfClass:[EventDispatchingWindow class]]) {
[event.os_event.window redispatchKeyEvent:event.os_event];
if (ns_event.window &&
[ns_event.window isKindOfClass:[EventDispatchingWindow class]]) {
[ns_event.window redispatchKeyEvent:ns_event];
// FIXME(nornagon): this isn't the right return value; we should implement
// devtools windows as Widgets in order to take advantage of the
// preexisting redispatch code in bridged_native_widget.
return false;
} else if (event.os_event.window &&
[event.os_event.window
} else if (ns_event.window &&
[ns_event.window
conformsToProtocol:@protocol(CommandDispatchingWindow)]) {
NSObject<CommandDispatchingWindow>* window =
static_cast<NSObject<CommandDispatchingWindow>*>(event.os_event.window);
[[window commandDispatcher] redispatchKeyEvent:event.os_event];
static_cast<NSObject<CommandDispatchingWindow>*>(ns_event.window);
[[window commandDispatcher] redispatchKeyEvent:ns_event];
// FIXME(clavin): Not exactly sure what to return here, likely the same
// situation as the branch above. If a future refactor removes
// |EventDispatchingWindow| then only this branch will need to remain.