89117fdd99
* chore: bump chromium in DEPS to 118.0.5951.0 * chore: update printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894 No logic changes, but patch needed to be manually re-applied due to upstream code shear * chore: update port_autofill_colors_to_the_color_pipeline.patch No manual changes; patch applied with fuzz * chore: update patches * chore: bump chromium in DEPS to 118.0.5953.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5955.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5957.0 * chore: update patches * chore: include path of native_web_keyboard_event.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 * chore: remove reference to eextensions/browser/notification-types.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627 * chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code? * chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198 * chore: add auto_pip_setting_helper.[cc,h] to chromium_src build Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277 Exiting upstream code used by chromium_src now depends on this new upstream class * chore: bump chromium in DEPS to 118.0.5959.0 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch manually adjust patch to minor upstream chagnes * chore: update patches * chore: bump chromium in DEPS to 118.0.5961.0 * chore: bump chromium in DEPS to 118.0.5963.0 * chore: update patches * 4780994: Rename various base files to "apple" since iOS uses them too https://chromium-review.googlesource.com/c/chromium/src/+/4780994 * Many files moved from `mac` -> `apple` This commit follows a handful of CLs that simply rename files/symbols to change `mac` to `apple` to signify their use across both macOS and iOS: - 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header - 4790744: Move foundation_util to base/apple, leave a forwarding header - 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header - 4787627: Move and rename macOS+iOS base/ files in PA to "apple" - 4780399: Move OSStatus logging to base/apple - 4787387: Remove forwarding headers - 4781113: Rename message_pump_mac to "apple" because iOS uses it too * fixup minor patch update error A function param got dropped from this patch somewhere earlier * chore: bump chromium in DEPS to 118.0.5965.2 * chore: update patches * 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base:🍎: https://chromium-review.googlesource.com/c/chromium/src/+/4799213 * Fix removed include to BrowserContext In crrev.com/c/4767962 an include to BrowserContext was removed, which was necessary for compilation. This broke only for us because "chrome/browser/profiles/profile.h" includes that class, but we remove all references to profiles. * chore: bump chromium in DEPS to 118.0.5967.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5969.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5971.0 * chore: bump chromium in DEPS to 118.0.5973.0 * chore: update patches * 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper https://chromium-review.googlesource.com/c/chromium/src/+/4772121 * 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate. https://chromium-review.googlesource.com/c/chromium/src/+/4811164 * 4809488: Remove duplicate dnd functionality between Web and Renderer prefs https://chromium-review.googlesource.com/c/chromium/src/+/4809488 Given that this is no longer an option of web preferences, we should consider deprecating this option and then removing it. * chore: bump chromium in DEPS to 118.0.5975.0 * chore: update patches * fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build * Reland "[windows] Remove RegKey::DeleteEmptyKey" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255 * Ensure StrCat means StrCat Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180 * fixup! Remove RegKey::DeleteEmptyKey * Consistently reject large p and large q in DH Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226 --------- 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: clavin <clavin@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
101 lines
3.7 KiB
Text
101 lines
3.7 KiB
Text
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "content/public/browser/render_widget_host_view.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/ui/cocoa/event_dispatching_window.h"
|
|
#include "shell/browser/web_contents_preferences.h"
|
|
#include "ui/base/cocoa/command_dispatcher.h"
|
|
#include "ui/base/cocoa/nsmenu_additions.h"
|
|
#include "ui/base/cocoa/nsmenuitem_additions.h"
|
|
#include "ui/events/keycodes/keyboard_codes.h"
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
@interface NSWindow (EventDispatchingWindow)
|
|
- (void)redispatchKeyEvent:(NSEvent*)event;
|
|
@end
|
|
|
|
namespace electron::api {
|
|
|
|
bool WebContents::IsFocused() const {
|
|
auto* view = web_contents()->GetRenderWidgetHostView();
|
|
if (!view)
|
|
return false;
|
|
|
|
if (GetType() != Type::kBackgroundPage) {
|
|
auto window = [web_contents()->GetNativeView().GetNativeNSView() window];
|
|
// On Mac the render widget host view does not lose focus when the window
|
|
// loses focus so check if the top level window is the key window.
|
|
if (window && ![window isKeyWindow])
|
|
return false;
|
|
}
|
|
|
|
return view->HasFocus();
|
|
}
|
|
|
|
bool WebContents::PlatformHandleKeyboardEvent(
|
|
content::WebContents* source,
|
|
const content::NativeWebKeyboardEvent& event) {
|
|
if (event.skip_if_unhandled ||
|
|
event.GetType() == content::NativeWebKeyboardEvent::Type::kChar)
|
|
return false;
|
|
|
|
// Escape exits tabbed fullscreen mode.
|
|
if (event.windows_key_code == ui::VKEY_ESCAPE && is_html_fullscreen()) {
|
|
ExitFullscreenModeForTab(source);
|
|
return true;
|
|
}
|
|
|
|
// Check if the webContents has preferences and to ignore shortcuts
|
|
auto* web_preferences = WebContentsPreferences::From(source);
|
|
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 (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
|
|
// keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv. If we let the
|
|
// 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:ns_event] != nil;
|
|
bool is_a_system_shortcut_event =
|
|
is_a_keyboard_shortcut_event &&
|
|
(ui::cocoa::ModifierMaskForKeyEvent(ns_event) &
|
|
NSEventModifierFlagFunction) != 0;
|
|
if (is_a_system_shortcut_event)
|
|
return false;
|
|
|
|
if ([[NSApp mainMenu] performKeyEquivalent:ns_event])
|
|
return true;
|
|
}
|
|
|
|
// Let the window redispatch the 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 (ns_event.window &&
|
|
[ns_event.window
|
|
conformsToProtocol:@protocol(CommandDispatchingWindow)]) {
|
|
NSObject<CommandDispatchingWindow>* window =
|
|
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.
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
} // namespace electron::api
|