mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 104.0.5098.0 * chore: bump chromium in DEPS to 104.0.5100.0 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: bump chromium in DEPS to 104.0.5103.0 * chore: bump chromium in DEPS to 104.0.5104.0 * chore: bump chromium in DEPS to 104.0.5106.0 * chore: bump chromium in DEPS to 104.0.5108.0 * chore: bump chromium in DEPS to 104.0.5110.0 * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 104.0.5112.4 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 (cherry picked from commit6ff37a08f7) * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 (cherry picked from commit46df809556) * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 (cherry picked from commit2fe1bc3222) * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 (cherry picked from commitca8a3852f4) * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 (cherry picked from commit18aac8e93e) * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 (cherry picked from commit070ea1700b) * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 (cherry picked from commit479647e0ac) * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 (cherry picked from commite15d6110ed) * chore: update patch indices (cherry picked from commit8d666da975) * chore: fix lint (cherry picked from commitf9a9aca456) * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 (cherry picked from commit014c4b9212) * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext (cherry picked from commit322e9686da) * chore: fix lint (cherry picked from commit12b886cc62) * build: run electron/script/gen-libc++-filenames.js fixes gn check (cherry picked from commit93cebfecb2) * chore: disable flaking tests (cherry picked from commitfd0bc08f44) * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 (cherry picked from commit43024a74c2) * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 (cherry picked from commit41026ae4d0) * chore: fixup patch indices (cherry picked from commitfccfc1bb29) * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 (cherry picked from commit6392cfb595) * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 (cherry picked from commit2d81975792) * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. (cherry picked from commit2f95568bfd) * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 (cherry picked from commitda4f0dbd1b) * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 (cherry picked from commitcb901ce489) * chore: update patch indices (cherry picked from commit40c6295a5b) * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 (cherry picked from commit55a58418e6) * fix: add patch for DCHECK in fullscreen test (cherry picked from commitc65280306d) * build: fix nan build (cherry picked from commitc06ea18698) * build: make the nan spec runner work on macOS (cherry picked from commita22950b126) * chore: update patches (cherry picked from commit7375148f93) * chore: update patches * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 (cherry picked from commited192f5c9b) * 3653285: Remove OS X 10.11 and macOS 10.12 code from chrome/ https://chromium-review.googlesource.com/c/chromium/src/+/3653285 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 (cherry picked from commit2a6804db60) * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 (cherry picked from commitfca99a5cf9) * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: missing includes in desktop_notification_controller (cherry picked from commit574fb7933d) * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * Revert "3560567: [MSC] Porting GenerateStreams clients to handle stream vectors." This reverts commit c9c1c534056404be22a2d81ae6df4d184654fa35. * Revert "3691014: Prevent unsafe narrowing: ui/accessibility, part 2" This reverts commit 08f7a35765fde0467ef44d773e943cf5998619ae. * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup: 3687671: [v8] Freeze flags after initialization * chore: bump chromium in DEPS to 104.0.5112.14 * chore: update patches * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 (cherry picked from commitfca99a5cf9) (cherry picked from commit 08f7a35765fde0467ef44d773e943cf5998619ae) * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. https://chromium-review.googlesource.com/c/chromium/src/+/3560567 (cherry picked from commit c9c1c534056404be22a2d81ae6df4d184654fa35) * 3669226: Remove printing PostTask usage of IO thread https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * chore: document breaking change (cherry picked from commitd0991597c2) * chore: update patches * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Revert "fixup: 3687671: [v8] Freeze flags after initialization" This reverts commit a473727f39267327c7a77ec5056edd36b7c5b403. * Revert "3687671: [v8] Freeze flags after initialization" This reverts commit 7a8404be3c9d48a2e7ce877d749362f4754a9f17. * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 (cherry picked from commitf4c53302ea) * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: bump chromium in DEPS to 104.0.5112.20 * chore: update patches patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch is no longer needed because it was upstreamed via: 2527943: Allow static access to WasmCodeGeneration callback https://chromium-review.googlesource.com/c/chromium/src/+/2527943 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 (cherry picked from commit797c3a1656) * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. (cherry picked from commit9741ab73cf) * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. (cherry picked from commit558ed59d86) * chore: bump chromium in DEPS to 104.0.5112.29 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.39 * chore: update patches * chore: update patches * Trigger Build * 3695382: [ext-code-space] Fix CodeRange allocation logic https://chromium-review.googlesource.com/c/v8/v8/+/3695382 fixes https://bugs.chromium.org/p/v8/issues/detail?id=12942 * 3695382: [ext-code-space] Fix CodeRange allocation logic https://chromium-review.googlesource.com/c/v8/v8/+/3695382 * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
185 lines
6.7 KiB
Plaintext
185 lines
6.7 KiB
Plaintext
// 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/mac/electron_application_delegate.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "base/allocator/allocator_shim.h"
|
|
#include "base/allocator/buildflags.h"
|
|
#include "base/mac/mac_util.h"
|
|
#include "base/mac/scoped_objc_class_swizzler.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/values.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/mac/dict_util.h"
|
|
#import "shell/browser/mac/electron_application.h"
|
|
|
|
#import <UserNotifications/UserNotifications.h>
|
|
|
|
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
|
// On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer,
|
|
// which would typically cause an OOM crash. To avoid this, the problematic
|
|
// method is swizzled out and the make-OOM-fatal bit is disabled for the
|
|
// duration of the original call. https://crbug.com/654695
|
|
static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|
@interface OOMDisabledIMKInputSession : NSObject
|
|
@end
|
|
@implementation OOMDisabledIMKInputSession
|
|
- (void)_coreAttributesFromRange:(NSRange)range
|
|
whichAttributes:(long long)attributes // NOLINT(runtime/int)
|
|
completionHandler:(void (^)(void))block {
|
|
// The allocator flag is per-process, so other threads may temporarily
|
|
// not have fatal OOM occur while this method executes, but it is better
|
|
// than crashing when using IME.
|
|
base::allocator::SetCallNewHandlerOnMallocFailure(false);
|
|
g_swizzle_imk_input_session->InvokeOriginal<
|
|
void, NSRange, long long, void (^)(void)>( // NOLINT(runtime/int)
|
|
self, _cmd, range, attributes, block);
|
|
base::allocator::SetCallNewHandlerOnMallocFailure(true);
|
|
}
|
|
@end
|
|
#endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
|
|
|
|
static NSDictionary* UNNotificationResponseToNSDictionary(
|
|
UNNotificationResponse* response) API_AVAILABLE(macosx(10.14)) {
|
|
// [response isKindOfClass:[UNNotificationResponse class]]
|
|
if (![response respondsToSelector:@selector(actionIdentifier)] ||
|
|
![response respondsToSelector:@selector(notification)]) {
|
|
return nil;
|
|
}
|
|
|
|
NSMutableDictionary* result = [[NSMutableDictionary alloc] init];
|
|
result[@"actionIdentifier"] = response.actionIdentifier;
|
|
result[@"date"] = @(response.notification.date.timeIntervalSince1970);
|
|
result[@"identifier"] = response.notification.request.identifier;
|
|
result[@"userInfo"] = response.notification.request.content.userInfo;
|
|
|
|
// [response isKindOfClass:[UNTextInputNotificationResponse class]]
|
|
if ([response respondsToSelector:@selector(userText)]) {
|
|
result[@"userText"] =
|
|
static_cast<UNTextInputNotificationResponse*>(response).userText;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@implementation ElectronApplicationDelegate
|
|
|
|
- (void)setApplicationDockMenu:(electron::ElectronMenuModel*)model {
|
|
menu_controller_.reset([[ElectronMenuController alloc] initWithModel:model
|
|
useDefaultAccelerator:NO]);
|
|
}
|
|
|
|
- (void)willPowerOff:(NSNotification*)notify {
|
|
[[AtomApplication sharedApplication] willPowerOff:notify];
|
|
}
|
|
|
|
- (void)applicationWillFinishLaunching:(NSNotification*)notify {
|
|
// Don't add the "Enter Full Screen" menu item automatically.
|
|
[[NSUserDefaults standardUserDefaults]
|
|
setBool:NO
|
|
forKey:@"NSFullScreenMenuItemEverywhere"];
|
|
|
|
[[[NSWorkspace sharedWorkspace] notificationCenter]
|
|
addObserver:self
|
|
selector:@selector(willPowerOff:)
|
|
name:NSWorkspaceWillPowerOffNotification
|
|
object:nil];
|
|
|
|
electron::Browser::Get()->WillFinishLaunching();
|
|
}
|
|
|
|
- (void)applicationDidFinishLaunching:(NSNotification*)notify {
|
|
NSObject* user_notification =
|
|
[notify userInfo][NSApplicationLaunchUserNotificationKey];
|
|
NSDictionary* notification_info = nil;
|
|
|
|
if (user_notification) {
|
|
if ([user_notification isKindOfClass:[NSUserNotification class]]) {
|
|
notification_info =
|
|
[static_cast<NSUserNotification*>(user_notification) userInfo];
|
|
} else if (@available(macOS 10.14, *)) {
|
|
notification_info = UNNotificationResponseToNSDictionary(
|
|
static_cast<UNNotificationResponse*>(user_notification));
|
|
}
|
|
}
|
|
|
|
electron::Browser::Get()->DidFinishLaunching(
|
|
electron::NSDictionaryToDictionaryValue(notification_info));
|
|
}
|
|
|
|
- (void)applicationDidBecomeActive:(NSNotification*)notification {
|
|
electron::Browser::Get()->DidBecomeActive();
|
|
}
|
|
|
|
- (NSMenu*)applicationDockMenu:(NSApplication*)sender {
|
|
if (menu_controller_)
|
|
return [menu_controller_ menu];
|
|
else
|
|
return nil;
|
|
}
|
|
|
|
- (BOOL)application:(NSApplication*)sender openFile:(NSString*)filename {
|
|
std::string filename_str(base::SysNSStringToUTF8(filename));
|
|
return electron::Browser::Get()->OpenFile(filename_str) ? YES : NO;
|
|
}
|
|
|
|
- (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
|
|
hasVisibleWindows:(BOOL)flag {
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
browser->Activate(static_cast<bool>(flag));
|
|
return flag;
|
|
}
|
|
|
|
- (BOOL)application:(NSApplication*)sender
|
|
continueUserActivity:(NSUserActivity*)userActivity
|
|
restorationHandler:
|
|
#ifdef MAC_OS_X_VERSION_10_14
|
|
(void (^)(NSArray<id<NSUserActivityRestoring>>* restorableObjects))
|
|
#else
|
|
(void (^)(NSArray* restorableObjects))
|
|
#endif
|
|
restorationHandler {
|
|
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
|
|
NSURL* url = userActivity.webpageURL;
|
|
NSDictionary* details = url ? @{@"webpageURL" : [url absoluteString]} : @{};
|
|
if (!userActivity.userInfo)
|
|
return NO;
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
return browser->ContinueUserActivity(
|
|
activity_type,
|
|
electron::NSDictionaryToDictionaryValue(userActivity.userInfo),
|
|
electron::NSDictionaryToDictionaryValue(details))
|
|
? YES
|
|
: NO;
|
|
}
|
|
|
|
- (BOOL)application:(NSApplication*)application
|
|
willContinueUserActivityWithType:(NSString*)userActivityType {
|
|
std::string activity_type(base::SysNSStringToUTF8(userActivityType));
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
return browser->WillContinueUserActivity(activity_type) ? YES : NO;
|
|
}
|
|
|
|
- (void)application:(NSApplication*)application
|
|
didFailToContinueUserActivityWithType:(NSString*)userActivityType
|
|
error:(NSError*)error {
|
|
std::string activity_type(base::SysNSStringToUTF8(userActivityType));
|
|
std::string error_message(
|
|
base::SysNSStringToUTF8([error localizedDescription]));
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
browser->DidFailToContinueUserActivity(activity_type, error_message);
|
|
}
|
|
|
|
- (IBAction)newWindowForTab:(id)sender {
|
|
electron::Browser::Get()->NewWindowForTab();
|
|
}
|
|
|
|
@end
|