e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 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 * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * 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. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: 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: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 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." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch 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: PatchUp <73610968+patchup[bot]@users.noreply.github.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: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
146 lines
5.3 KiB
Diff
146 lines
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:48:49 -0700
|
|
Subject: mas: disable private window-frame APIs
|
|
|
|
Disable private window frame APIs (NSNextStepFrame and NSThemeFrame) for MAS
|
|
build.
|
|
|
|
diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
|
|
index 4d8f9f89f03653221fc0b509aa0e15ff20e73574..7bd5094db9b1a8e9af4ecc118fed7b78178e1e58 100644
|
|
--- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
|
|
+++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
|
|
@@ -9,6 +9,7 @@
|
|
#include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
|
|
#include "components/remote_cocoa/common/native_widget_ns_window_host.mojom.h"
|
|
|
|
+#ifndef MAS_BUILD
|
|
@interface NSWindow (PrivateBrowserNativeWidgetAPI)
|
|
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
|
|
@end
|
|
@@ -55,10 +56,13 @@ - (BOOL)_shouldCenterTrafficLights {
|
|
|
|
@end
|
|
|
|
+#endif // MAS_BUILD
|
|
+
|
|
@implementation BrowserNativeWidgetWindow
|
|
|
|
// NSWindow (PrivateAPI) overrides.
|
|
|
|
+#ifndef MAS_BUILD
|
|
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
|
|
// - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
|
|
if ([BrowserWindowFrame class])
|
|
@@ -73,6 +77,8 @@ - (BOOL)_usesCustomDrawing {
|
|
return NO;
|
|
}
|
|
|
|
+#endif // MAS_BUILD
|
|
+
|
|
// Handle "Move focus to the window toolbar" configured in System Preferences ->
|
|
// Keyboard -> Shortcuts -> Keyboard. Usually Ctrl+F5. The argument (|unknown|)
|
|
// tends to just be nil.
|
|
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm
|
|
index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70ba3674913 100644
|
|
--- a/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm
|
|
+++ b/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm
|
|
@@ -4,6 +4,8 @@
|
|
|
|
#import "components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.h"
|
|
|
|
+#ifndef MAS_BUILD
|
|
+
|
|
@interface NSWindow (PrivateAPI)
|
|
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
|
|
@end
|
|
@@ -18,8 +20,12 @@ - (CGFloat)_titlebarHeight {
|
|
}
|
|
@end
|
|
|
|
+#endif // MAS_BUILD
|
|
+
|
|
@implementation NativeWidgetMacFramelessNSWindow
|
|
|
|
+#ifndef MAS_BUILD
|
|
+
|
|
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
|
|
if ([NativeWidgetMacFramelessNSWindowFrame class]) {
|
|
return [NativeWidgetMacFramelessNSWindowFrame class];
|
|
@@ -27,4 +33,6 @@ + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
|
|
return [super frameViewClassForStyleMask:windowStyle];
|
|
}
|
|
|
|
+#endif // MAS_BUILD
|
|
+
|
|
@end
|
|
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
|
|
index 67ebc56bd7ee267c03a5543e10a6a41042fcaa38..af3ed27dea51c22ab32ce14686dd7807eb797316 100644
|
|
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
|
|
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
|
|
@@ -17,6 +17,7 @@ class NativeWidgetNSWindowBridge;
|
|
|
|
@protocol WindowTouchBarDelegate;
|
|
|
|
+#ifndef MAS_BUILD
|
|
// Weak lets Chrome launch even if a future macOS doesn't have the below classes
|
|
WEAK_IMPORT_ATTRIBUTE
|
|
@interface NSNextStepFrame : NSView
|
|
@@ -33,6 +34,7 @@ REMOTE_COCOA_APP_SHIM_EXPORT
|
|
REMOTE_COCOA_APP_SHIM_EXPORT
|
|
@interface NativeWidgetMacNSWindowTitledFrame : NSThemeFrame
|
|
@end
|
|
+#endif
|
|
|
|
// The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
|
|
// can only be accomplished by overriding methods.
|
|
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
index 48c86f5aa9578545f43b04b520e9f1dd92d224c5..fc57c47fe6afaabf363c9efdf75f60e866244fdb 100644
|
|
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
@@ -77,7 +77,9 @@ void OrderChildWindow(NSWindow* child_window,
|
|
} // namespace
|
|
|
|
@interface NSWindow (Private)
|
|
+#ifndef MAS_BUILD
|
|
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle;
|
|
+#endif
|
|
- (BOOL)hasKeyAppearance;
|
|
- (long long)_resizeDirectionForMouseLocation:(CGPoint)location;
|
|
- (BOOL)_isConsideredOpenForPersistentState;
|
|
@@ -109,6 +111,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
|
|
}
|
|
@end
|
|
|
|
+#ifndef MAS_BUILD
|
|
+
|
|
@implementation NativeWidgetMacNSWindowTitledFrame
|
|
- (void)mouseDown:(NSEvent*)event {
|
|
if (self.window.isMovable)
|
|
@@ -135,6 +139,8 @@ - (BOOL)usesCustomDrawing {
|
|
}
|
|
@end
|
|
|
|
+#endif // MAS_BUILD
|
|
+
|
|
@implementation NativeWidgetMacNSWindow {
|
|
@private
|
|
base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
|
|
@@ -281,6 +287,8 @@ - (BOOL)hasViewsMenuActive {
|
|
|
|
// NSWindow overrides.
|
|
|
|
+#ifndef MAS_BUILD
|
|
+
|
|
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
if (windowStyle & NSWindowStyleMaskTitled) {
|
|
if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
|
|
@@ -292,6 +300,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
return [super frameViewClassForStyleMask:windowStyle];
|
|
}
|
|
|
|
+#endif
|
|
+
|
|
- (BOOL)_isTitleHidden {
|
|
bool shouldShowWindowTitle = YES;
|
|
if (_bridge)
|