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

chore: update patches (#24919)

Browse source
This commit is contained in:
Samuel Attard 2020-08-10 08:23:21 -07:00 committed by GitHub
parent 8311078a96
commit 047650b564
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/chromium/command-ismediakey.patch
View file

@ -74,7 +74,7 @@ index 6052fd13ff3d63cf8a4b019b058efb61aad39c3b..42eac7a7b656096c1d2039e340037ac8
} }
return VKEY_UNKNOWN; return VKEY_UNKNOWN;
} }
@@ -193,7 +199,10 @@ CGEventRef MediaKeysListenerImpl::EventTapCallback(CGEventTapProxy proxy, @@ -193,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
int key_code = (data1 & 0xFFFF0000) >> 16; int key_code = (data1 & 0xFFFF0000) >> 16;
if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT && if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST && key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&

4
patches/chromium/crash_allow_setting_more_options.patch
View file

@ -78,7 +78,7 @@ diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/a
index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed19b9cb4b 100644 index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed19b9cb4b 100644
--- a/components/crash/core/app/crashpad_mac.mm --- a/components/crash/core/app/crashpad_mac.mm
+++ b/components/crash/core/app/crashpad_mac.mm +++ b/components/crash/core/app/crashpad_mac.mm
@@ -67,6 +67,8 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() { @@ -67,6 +67,8 @@
} // @autoreleasepool } // @autoreleasepool
return process_annotations; return process_annotations;
}(); }();
@ -87,7 +87,7 @@ index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed
return annotations; return annotations;
} }
@@ -137,6 +139,13 @@ base::FilePath PlatformCrashpadInitialization( @@ -137,6 +139,13 @@ void DumpProcessWithoutCrashing(task_t task_port) {
std::vector<std::string> arguments; std::vector<std::string> arguments;

2
patches/chromium/disable_compositor_recycling.patch
View file

@ -9,7 +9,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/cont
index b5e4f8fb0e914078ae40d034e1b785f77607bbea..e8a6199632a3110ae5d0238dfe3568df9224f353 100644 index b5e4f8fb0e914078ae40d034e1b785f77607bbea..e8a6199632a3110ae5d0238dfe3568df9224f353 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -478,7 +478,11 @@ void RenderWidgetHostViewMac::WasOccluded() { @@ -478,7 +478,11 @@
return; return;
host()->WasHidden(); host()->WasHidden();

10
patches/chromium/fix_provide_axtextchangevaluestartmarker_a11y_value_change.patch
View file

@ -33,7 +33,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont
index 090c8fdc3b374ed937d3e04ccd5d91772acc7d9d..8a96c55b638b33f390372c2a30228dabad08665a 100644 index 090c8fdc3b374ed937d3e04ccd5d91772acc7d9d..8a96c55b638b33f390372c2a30228dabad08665a 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -1882,7 +1882,11 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -1882,7 +1882,11 @@ - (BOOL)shouldExposeTitleUIElement {
base::string16 deletedText = oldValue.substr(i, oldValue.length() - i - j); base::string16 deletedText = oldValue.substr(i, oldValue.length() - i - j);
base::string16 insertedText = newValue.substr(i, newValue.length() - i - j); base::string16 insertedText = newValue.substr(i, newValue.length() - i - j);
@ -46,7 +46,7 @@ index 090c8fdc3b374ed937d3e04ccd5d91772acc7d9d..8a96c55b638b33f390372c2a30228dab
} }
- (BOOL)instanceActive { - (BOOL)instanceActive {
@@ -2257,7 +2261,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2257,7 +2261,7 @@ - (NSValue*)selectedTextRange {
- (id)selectedTextMarkerRange { - (id)selectedTextMarkerRange {
if (![self instanceActive]) if (![self instanceActive])
return nil; return nil;
@ -73,7 +73,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 5972939a070908521e82845b084d2d3b9f9a73f8..fda1d2f9fdccbff035d05f0dfc39238a8a667522 100644 index 5972939a070908521e82845b084d2d3b9f9a73f8..fda1d2f9fdccbff035d05f0dfc39238a8a667522 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -94,6 +94,7 @@ NSString* const NSAccessibilityTextSelectionChangedFocus = @@ -94,6 +94,7 @@
NSString* const NSAccessibilityTextChangeElement = @"AXTextChangeElement"; NSString* const NSAccessibilityTextChangeElement = @"AXTextChangeElement";
NSString* const NSAccessibilityTextEditType = @"AXTextEditType"; NSString* const NSAccessibilityTextEditType = @"AXTextEditType";
NSString* const NSAccessibilityTextChangeValue = @"AXTextChangeValue"; NSString* const NSAccessibilityTextChangeValue = @"AXTextChangeValue";
@ -81,7 +81,7 @@ index 5972939a070908521e82845b084d2d3b9f9a73f8..fda1d2f9fdccbff035d05f0dfc39238a
NSString* const NSAccessibilityTextChangeValueLength = NSString* const NSAccessibilityTextChangeValueLength =
@"AXTextChangeValueLength"; @"AXTextChangeValueLength";
NSString* const NSAccessibilityTextChangeValues = @"AXTextChangeValues"; NSString* const NSAccessibilityTextChangeValues = @"AXTextChangeValues";
@@ -313,16 +314,18 @@ void BrowserAccessibilityManagerMac::FireGeneratedEvent( @@ -313,16 +314,18 @@ void PostAnnouncementNotification(NSString* announcement) {
if (base::mac::IsAtLeastOS10_11() && !text_edits_.empty()) { if (base::mac::IsAtLeastOS10_11() && !text_edits_.empty()) {
base::string16 deleted_text; base::string16 deleted_text;
base::string16 inserted_text; base::string16 inserted_text;
@ -103,7 +103,7 @@ index 5972939a070908521e82845b084d2d3b9f9a73f8..fda1d2f9fdccbff035d05f0dfc39238a
BrowserAccessibility* root = GetRoot(); BrowserAccessibility* root = GetRoot();
if (!root) if (!root)
@@ -546,27 +549,34 @@ NSDictionary* @@ -546,27 +549,34 @@ void PostAnnouncementNotification(NSString* announcement) {
BrowserAccessibilityManagerMac::GetUserInfoForValueChangedNotification( BrowserAccessibilityManagerMac::GetUserInfoForValueChangedNotification(
const BrowserAccessibilityCocoa* native_node, const BrowserAccessibilityCocoa* native_node,
const base::string16& deleted_text, const base::string16& deleted_text,

2
patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch
View file

@ -12,7 +12,7 @@ diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/
index befe726af9c10b1563a7fc0bb77cc55f65943d5c..bac51f33f35f96fe4ecc764cf5ca887176642f74 100644 index befe726af9c10b1563a7fc0bb77cc55f65943d5c..bac51f33f35f96fe4ecc764cf5ca887176642f74 100644
--- a/chrome/browser/extensions/global_shortcut_listener_mac.mm --- a/chrome/browser/extensions/global_shortcut_listener_mac.mm
+++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm +++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm
@@ -39,7 +39,7 @@ GlobalShortcutListenerMac::GlobalShortcutListenerMac() @@ -39,7 +39,7 @@
// global MediaKeysListener to receive media keys. // global MediaKeysListener to receive media keys.
if (!content::MediaKeysListenerManager::IsMediaKeysListenerManagerEnabled()) { if (!content::MediaKeysListenerManager::IsMediaKeysListenerManagerEnabled()) {
media_keys_listener_ = ui::MediaKeysListener::Create( media_keys_listener_ = ui::MediaKeysListener::Create(

6
patches/chromium/mas-cfisobjc.patch
View file

@ -9,7 +9,7 @@ diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a91027bf05 100644 index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a91027bf05 100644
--- a/base/mac/foundation_util.mm --- a/base/mac/foundation_util.mm
+++ b/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm
@@ -28,12 +28,6 @@ CFTypeID SecKeyGetTypeID(); @@ -28,12 +28,6 @@
#if !defined(OS_IOS) #if !defined(OS_IOS)
CFTypeID SecACLGetTypeID(); CFTypeID SecACLGetTypeID();
CFTypeID SecTrustedApplicationGetTypeID(); CFTypeID SecTrustedApplicationGetTypeID();
@ -22,7 +22,7 @@ index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a9
#endif #endif
} // extern "C" } // extern "C"
@@ -326,8 +320,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) { @@ -326,8 +320,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val)); const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
DCHECK(!cf_val || DCHECK(!cf_val ||
CTFontGetTypeID() == CFGetTypeID(cf_val) || CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@ -32,7 +32,7 @@ index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a9
return ns_val; return ns_val;
} }
@@ -398,9 +391,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) { @@ -398,9 +391,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
return (CTFontRef)(cf_val); return (CTFontRef)(cf_val);
} }

6
patches/chromium/mas_blink_no_private_api.patch
View file

@ -18,7 +18,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d
extern "C" { extern "C" {
// Kill ring calls. Would be better to use NSKillRing.h, but that's not // Kill ring calls. Would be better to use NSKillRing.h, but that's not
@@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing(); @@ -39,38 +40,53 @@
void _NSNewKillRingSequence(); void _NSNewKillRingSequence();
void _NSSetKillRingToYankedState(); void _NSSetKillRingToYankedState();
} }
@ -92,7 +92,7 @@ index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e
namespace blink { namespace blink {
@@ -95,10 +97,12 @@ bool ThemePainterMac::PaintTextField(const Node* node, @@ -95,10 +97,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
// behavior change while remaining a fragile solution. // behavior change while remaining a fragile solution.
// https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3 // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3
if (!use_ns_text_field_cell) { if (!use_ns_text_field_cell) {
@ -105,7 +105,7 @@ index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e
return false; return false;
} }
@@ -186,10 +190,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node, @@ -186,10 +190,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
const IntRect& r) { const IntRect& r) {
ScopedColorSchemeAppearance appearance(style.UsedColorScheme()); ScopedColorSchemeAppearance appearance(style.UsedColorScheme());
LocalCurrentGraphicsContext local_context(paint_info.context, r); LocalCurrentGraphicsContext local_context(paint_info.context, r);

18
patches/chromium/mas_disable_custom_window_frame.patch
View file

@ -18,7 +18,7 @@ index 69580888047c4ac6abb68873315bcafb78dda706..aa347913a75084f669bf7d89fbcc919b
@interface NSWindow (PrivateBrowserNativeWidgetAPI) @interface NSWindow (PrivateBrowserNativeWidgetAPI)
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
@end @end
@@ -63,6 +64,8 @@ @@ -63,6 +64,8 @@ - (NSRect)_draggableFrame NS_DEPRECATED_MAC(10_10, 10_11) {
@end @end
@ -27,7 +27,7 @@ index 69580888047c4ac6abb68873315bcafb78dda706..aa347913a75084f669bf7d89fbcc919b
@implementation BrowserNativeWidgetWindow @implementation BrowserNativeWidgetWindow
// Prevent detached tabs from glitching when the window is partially offscreen. // Prevent detached tabs from glitching when the window is partially offscreen.
@@ -84,6 +87,7 @@ @@ -84,6 +87,7 @@ - (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen*)screen {
// NSWindow (PrivateAPI) overrides. // NSWindow (PrivateAPI) overrides.
@ -35,7 +35,7 @@ index 69580888047c4ac6abb68873315bcafb78dda706..aa347913a75084f669bf7d89fbcc919b
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
// - NSThemeFrame and its subclasses will be nil if it's missing at runtime. // - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
if ([BrowserWindowFrame class]) if ([BrowserWindowFrame class])
@@ -98,6 +102,8 @@ @@ -98,6 +102,8 @@ - (BOOL)_usesCustomDrawing {
return NO; return NO;
} }
@ -57,7 +57,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b
@interface NSWindow (PrivateAPI) @interface NSWindow (PrivateAPI)
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
@end @end
@@ -18,8 +20,12 @@ @@ -18,8 +20,12 @@ - (CGFloat)_titlebarHeight {
} }
@end @end
@ -70,7 +70,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
if ([NativeWidgetMacFramelessNSWindowFrame class]) { if ([NativeWidgetMacFramelessNSWindowFrame class]) {
return [NativeWidgetMacFramelessNSWindowFrame class]; return [NativeWidgetMacFramelessNSWindowFrame class];
@@ -27,4 +33,6 @@ @@ -27,4 +33,6 @@ + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
return [super frameViewClassForStyleMask:windowStyle]; return [super frameViewClassForStyleMask:windowStyle];
} }
@ -111,7 +111,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7
- (BOOL)hasKeyAppearance; - (BOOL)hasKeyAppearance;
- (long long)_resizeDirectionForMouseLocation:(CGPoint)location; - (long long)_resizeDirectionForMouseLocation:(CGPoint)location;
- (BOOL)_isConsideredOpenForPersistentState; - (BOOL)_isConsideredOpenForPersistentState;
@@ -58,6 +60,8 @@ @@ -58,6 +60,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
} }
@end @end
@ -120,7 +120,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7
@implementation NativeWidgetMacNSWindowTitledFrame @implementation NativeWidgetMacNSWindowTitledFrame
- (void)mouseDown:(NSEvent*)event { - (void)mouseDown:(NSEvent*)event {
if (base::mac::IsAtMostOS10_11() && self.window.isMovable) if (base::mac::IsAtMostOS10_11() && self.window.isMovable)
@@ -84,6 +88,8 @@ @@ -84,6 +88,8 @@ - (BOOL)usesCustomDrawing {
} }
@end @end
@ -129,7 +129,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7
@implementation NativeWidgetMacNSWindow { @implementation NativeWidgetMacNSWindow {
@private @private
base::scoped_nsobject<CommandDispatcher> _commandDispatcher; base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
@@ -165,6 +171,8 @@ @@ -165,6 +171,8 @@ - (BOOL)hasViewsMenuActive {
// NSWindow overrides. // NSWindow overrides.
@ -138,7 +138,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle { + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
if (windowStyle & NSWindowStyleMaskTitled) { if (windowStyle & NSWindowStyleMaskTitled) {
if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class]) if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
@@ -176,6 +184,8 @@ @@ -176,6 +184,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
return [super frameViewClassForStyleMask:windowStyle]; return [super frameViewClassForStyleMask:windowStyle];
} }

26
patches/chromium/mas_disable_remote_accessibility.patch
View file

@ -17,7 +17,7 @@ diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components
index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209ff3cbfaaa 100644 index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209ff3cbfaaa 100644
--- a/components/remote_cocoa/app_shim/application_bridge.mm --- a/components/remote_cocoa/app_shim/application_bridge.mm
+++ b/components/remote_cocoa/app_shim/application_bridge.mm +++ b/components/remote_cocoa/app_shim/application_bridge.mm
@@ -49,6 +49,7 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { @@ -49,6 +49,7 @@
// NativeWidgetNSWindowHostHelper: // NativeWidgetNSWindowHostHelper:
id GetNativeViewAccessible() override { id GetNativeViewAccessible() override {
@ -25,7 +25,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f
if (!remote_accessibility_element_) { if (!remote_accessibility_element_) {
int64_t browser_pid = 0; int64_t browser_pid = 0;
std::vector<uint8_t> element_token; std::vector<uint8_t> element_token;
@@ -59,6 +60,9 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { @@ -59,6 +60,9 @@ id GetNativeViewAccessible() override {
ui::RemoteAccessibility::GetRemoteElementFromToken(element_token); ui::RemoteAccessibility::GetRemoteElementFromToken(element_token);
} }
return remote_accessibility_element_.get(); return remote_accessibility_element_.get();
@ -35,7 +35,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f
} }
void DispatchKeyEvent(ui::KeyEvent* event) override { void DispatchKeyEvent(ui::KeyEvent* event) override {
bool event_handled = false; bool event_handled = false;
@@ -96,8 +100,10 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { @@ -96,8 +100,10 @@ void GetWordAt(const gfx::Point& location_in_content,
mojo::AssociatedRemote<mojom::TextInputHost> text_input_host_remote_; mojo::AssociatedRemote<mojom::TextInputHost> text_input_host_remote_;
std::unique_ptr<NativeWidgetNSWindowBridge> bridge_; std::unique_ptr<NativeWidgetNSWindowBridge> bridge_;
@ -50,7 +50,7 @@ diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 2ee45cb069ec5d78d9c7a3f61fdd1d444a590f41..badc4323b910f8e3957583e05af303472cb204f6 100644 index 2ee45cb069ec5d78d9c7a3f61fdd1d444a590f41..badc4323b910f8e3957583e05af303472cb204f6 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -543,10 +543,12 @@ void NativeWidgetNSWindowBridge::CreateContentView(uint64_t ns_view_id, @@ -543,10 +543,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
// this should be treated as an error and caught early. // this should be treated as an error and caught early.
CHECK(bridged_view_); CHECK(bridged_view_);
@ -67,7 +67,7 @@ diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/cont
index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a4dc4ea8e 100644 index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a4dc4ea8e 100644
--- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
+++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
@@ -70,8 +70,10 @@ class RenderWidgetHostNSViewBridgeOwner @@ -70,8 +70,10 @@ id GetFocusedBrowserAccessibilityElement() override {
return nil; return nil;
} }
void SetAccessibilityWindow(NSWindow* window) override { void SetAccessibilityWindow(NSWindow* window) override {
@ -78,7 +78,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a
} }
void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event, void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event,
@@ -133,8 +135,10 @@ class RenderWidgetHostNSViewBridgeOwner @@ -133,8 +135,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
mojo::AssociatedRemote<mojom::RenderWidgetHostNSViewHost> host_; mojo::AssociatedRemote<mojom::RenderWidgetHostNSViewHost> host_;
std::unique_ptr<RenderWidgetHostNSViewBridge> bridge_; std::unique_ptr<RenderWidgetHostNSViewBridge> bridge_;
@ -120,7 +120,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/cont
index ed223cdb6ea7a0f6130547b7988982bb44aa157d..b5e4f8fb0e914078ae40d034e1b785f77607bbea 100644 index ed223cdb6ea7a0f6130547b7988982bb44aa157d..b5e4f8fb0e914078ae40d034e1b785f77607bbea 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -233,8 +233,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { @@ -233,8 +233,10 @@
void RenderWidgetHostViewMac::MigrateNSViewBridge( void RenderWidgetHostViewMac::MigrateNSViewBridge(
remote_cocoa::mojom::Application* remote_cocoa_application, remote_cocoa::mojom::Application* remote_cocoa_application,
uint64_t parent_ns_view_id) { uint64_t parent_ns_view_id) {
@ -131,7 +131,7 @@ index ed223cdb6ea7a0f6130547b7988982bb44aa157d..b5e4f8fb0e914078ae40d034e1b785f7
// Disconnect from the previous bridge (this will have the effect of // Disconnect from the previous bridge (this will have the effect of
// destroying the associated bridge), and close the receiver (to allow it // destroying the associated bridge), and close the receiver (to allow it
@@ -1377,8 +1379,10 @@ RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessible() { @@ -1377,8 +1379,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
gfx::NativeViewAccessible gfx::NativeViewAccessible
RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() { RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@ -142,7 +142,7 @@ index ed223cdb6ea7a0f6130547b7988982bb44aa157d..b5e4f8fb0e914078ae40d034e1b785f7
return [GetInProcessNSView() window]; return [GetInProcessNSView() window];
} }
@@ -1410,9 +1414,11 @@ id RenderWidgetHostViewMac::GetFocusedBrowserAccessibilityElement() { @@ -1410,9 +1414,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
} }
void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) { void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@ -154,7 +154,7 @@ index ed223cdb6ea7a0f6130547b7988982bb44aa157d..b5e4f8fb0e914078ae40d034e1b785f7
} }
bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame( bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
@@ -1899,12 +1905,14 @@ void RenderWidgetHostViewMac::StopSpeaking() { @@ -1899,12 +1905,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken( void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
const std::vector<uint8_t>& window_token) { const std::vector<uint8_t>& window_token) {
@ -239,7 +239,7 @@ diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa
index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e9846558d1a 100644 index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e9846558d1a 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -282,14 +282,22 @@ gfx::NativeViewAccessible @@ -282,14 +282,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const { NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
if (in_process_ns_window_bridge_) if (in_process_ns_window_bridge_)
return in_process_ns_window_bridge_->ns_view(); return in_process_ns_window_bridge_->ns_view();
@ -262,7 +262,7 @@ index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e98
} }
remote_cocoa::mojom::NativeWidgetNSWindow* remote_cocoa::mojom::NativeWidgetNSWindow*
@@ -1118,6 +1126,7 @@ void NativeWidgetMacNSWindowHost::OnFocusWindowToolbar() { @@ -1118,6 +1126,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
const std::vector<uint8_t>& window_token, const std::vector<uint8_t>& window_token,
const std::vector<uint8_t>& view_token) { const std::vector<uint8_t>& view_token) {
@ -270,7 +270,7 @@ index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e98
remote_window_accessible_ = remote_window_accessible_ =
ui::RemoteAccessibility::GetRemoteElementFromToken(window_token); ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
remote_view_accessible_ = remote_view_accessible_ =
@@ -1125,14 +1134,17 @@ void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( @@ -1125,14 +1134,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
[remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()]; [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
[remote_view_accessible_ [remote_view_accessible_
setTopLevelUIElement:remote_window_accessible_.get()]; setTopLevelUIElement:remote_window_accessible_.get()];

10
patches/chromium/mas_disable_remote_layer.patch
View file

@ -44,7 +44,7 @@ diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/se
index 67e0efb23c717c3194f27695215a8bd20dbbb957..cf02fab328d9fe7a6e9f53c712a7c1c871b8b304 100644 index 67e0efb23c717c3194f27695215a8bd20dbbb957..cf02fab328d9fe7a6e9f53c712a7c1c871b8b304 100644
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
@@ -51,7 +51,7 @@ ImageTransportSurfaceOverlayMacBase<BaseClass>:: @@ -51,7 +51,7 @@
ca_layer_tree_coordinator_.reset(new ui::CALayerTreeCoordinator( ca_layer_tree_coordinator_.reset(new ui::CALayerTreeCoordinator(
use_remote_layer_api_, allow_av_sample_buffer_display_layer)); use_remote_layer_api_, allow_av_sample_buffer_display_layer));
@ -53,7 +53,7 @@ index 67e0efb23c717c3194f27695215a8bd20dbbb957..cf02fab328d9fe7a6e9f53c712a7c1c8
// Create the CAContext to send this to the GPU process, and the layer for // Create the CAContext to send this to the GPU process, and the layer for
// the context. // the context.
if (use_remote_layer_api_) { if (use_remote_layer_api_) {
@@ -60,6 +60,7 @@ ImageTransportSurfaceOverlayMacBase<BaseClass>:: @@ -60,6 +60,7 @@
options:@{}] retain]); options:@{}] retain]);
[ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()]; [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
} }
@ -61,7 +61,7 @@ index 67e0efb23c717c3194f27695215a8bd20dbbb957..cf02fab328d9fe7a6e9f53c712a7c1c8
} }
template <typename BaseClass> template <typename BaseClass>
@@ -140,7 +141,9 @@ ImageTransportSurfaceOverlayMacBase<BaseClass>::SwapBuffersInternal( @@ -140,7 +141,9 @@
"GLImpl", static_cast<int>(gl::GetGLImplementation()), "GLImpl", static_cast<int>(gl::GetGLImplementation()),
"width", pixel_size_.width()); "width", pixel_size_.width());
if (use_remote_layer_api_) { if (use_remote_layer_api_) {
@ -75,7 +75,7 @@ diff --git a/ui/accelerated_widget_mac/display_ca_layer_tree.mm b/ui/accelerated
index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a07734412593e37 100644 index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a07734412593e37 100644
--- a/ui/accelerated_widget_mac/display_ca_layer_tree.mm --- a/ui/accelerated_widget_mac/display_ca_layer_tree.mm
+++ b/ui/accelerated_widget_mac/display_ca_layer_tree.mm +++ b/ui/accelerated_widget_mac/display_ca_layer_tree.mm
@@ -98,6 +98,7 @@ void DisplayCALayerTree::UpdateCALayerTree( @@ -98,6 +98,7 @@ - (void)setContentsChanged;
} }
void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) { void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) {
@ -83,7 +83,7 @@ index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a077344
// Early-out if the remote layer has not changed. // Early-out if the remote layer has not changed.
if ([remote_layer_ contextId] == ca_context_id) if ([remote_layer_ contextId] == ca_context_id)
return; return;
@@ -122,6 +123,9 @@ void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) { @@ -122,6 +123,9 @@ - (void)setContentsChanged;
[io_surface_layer_ removeFromSuperlayer]; [io_surface_layer_ removeFromSuperlayer];
io_surface_layer_.reset(); io_surface_layer_.reset();
} }

72
patches/chromium/mas_no_private_api.patch
View file

@ -10,7 +10,7 @@ diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b
index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa0481551d 100644 index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa0481551d 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
@@ -341,11 +341,13 @@ AccessibilityTreeFormatterMac::ParamByPropertyNode( @@ -341,11 +341,13 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
param = PropertyNodeToRange(property_node); param = PropertyNodeToRange(property_node);
} else if (property_name == "AXIndexForChildUIElement") { // UIElement } else if (property_name == "AXIndexForChildUIElement") { // UIElement
param = PropertyNodeToUIElement(property_node, line_indexes_map); param = PropertyNodeToUIElement(property_node, line_indexes_map);
@ -24,7 +24,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
} }
return param; return param;
@@ -433,6 +435,7 @@ AccessibilityTreeFormatterMac::PropertyNodeToUIElement( @@ -433,6 +435,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
return uielement; return uielement;
} }
@ -32,7 +32,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
id AccessibilityTreeFormatterMac::DictNodeToTextMarker( id AccessibilityTreeFormatterMac::DictNodeToTextMarker(
const PropertyNode& dictnode, const PropertyNode& dictnode,
const LineIndexesMap& line_indexes_map) const { const LineIndexesMap& line_indexes_map) const {
@@ -512,6 +515,7 @@ id AccessibilityTreeFormatterMac::PropertyNodeToTextMarkerRange( @@ -512,6 +515,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
return content::AXTextMarkerRangeFrom(anchor_textmarker, focus_textmarker); return content::AXTextMarkerRangeFrom(anchor_textmarker, focus_textmarker);
} }
@ -40,7 +40,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
base::Value AccessibilityTreeFormatterMac::PopulateSize( base::Value AccessibilityTreeFormatterMac::PopulateSize(
const BrowserAccessibilityCocoa* cocoa_node) const { const BrowserAccessibilityCocoa* cocoa_node) const {
@@ -573,7 +577,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( @@ -573,7 +577,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
0 == strcmp([value objCType], @encode(NSRange))) { 0 == strcmp([value objCType], @encode(NSRange))) {
return PopulateRange([value rangeValue]); return PopulateRange([value rangeValue]);
} }
@ -49,7 +49,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
// AXTextMarker // AXTextMarker
if (content::IsAXTextMarker(value)) { if (content::IsAXTextMarker(value)) {
return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(),
@@ -584,7 +588,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( @@ -584,7 +588,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
if (content::IsAXTextMarkerRange(value)) { if (content::IsAXTextMarkerRange(value)) {
return PopulateTextMarkerRange(value, line_indexes_map); return PopulateTextMarkerRange(value, line_indexes_map);
} }
@ -58,7 +58,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
// Accessible object // Accessible object
if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) {
return base::Value(NodeToLineIndex(value, line_indexes_map)); return base::Value(NodeToLineIndex(value, line_indexes_map));
@@ -635,7 +639,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( @@ -635,7 +639,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
kConstValuePrefix + affinity); kConstValuePrefix + affinity);
return set; return set;
} }
@ -67,7 +67,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange(
id object, id object,
const LineIndexesMap& line_indexes_map) const { const LineIndexesMap& line_indexes_map) const {
@@ -650,7 +654,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( @@ -650,7 +654,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map));
return dict; return dict;
} }
@ -123,7 +123,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont
index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d91772acc7d9d 100644 index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d91772acc7d9d 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -208,6 +208,7 @@ NSString* const @@ -208,6 +208,7 @@
NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute = NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute =
@"AXLengthForTextMarkerRange"; @"AXLengthForTextMarkerRange";
@ -131,7 +131,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Private attributes that can be used for testing text markers, e.g. in dump // Private attributes that can be used for testing text markers, e.g. in dump
// tree tests. // tree tests.
NSString* const NSString* const
@@ -219,6 +220,7 @@ NSString* const @@ -219,6 +220,7 @@
NSString* const NSString* const
NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute = NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute =
@"AXTextMarkerNodeDebugDescription"; @"AXTextMarkerNodeDebugDescription";
@ -139,7 +139,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Other private attributes. // Other private attributes.
NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute = NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute =
@@ -242,6 +244,7 @@ NSDictionary* attributeToMethodNameMap = nil; @@ -242,6 +244,7 @@
// VoiceOver uses -1 to mean "no limit" for AXResultsLimit. // VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
const int kAXResultsLimitNoLimit = -1; const int kAXResultsLimitNoLimit = -1;
@ -147,7 +147,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
extern "C" { extern "C" {
// The following are private accessibility APIs required for cursor navigation // The following are private accessibility APIs required for cursor navigation
@@ -470,6 +473,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(id marker_range) { @@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range,
AddMisspelledTextAttributes(ax_range, attributed_text); AddMisspelledTextAttributes(ax_range, attributed_text);
return attributed_text; return attributed_text;
} }
@ -155,7 +155,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Returns an autoreleased copy of the AXNodeData's attribute. // Returns an autoreleased copy of the AXNodeData's attribute.
NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility, NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
@@ -727,6 +731,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; @@ -727,6 +731,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
#define NSAccessibilityLanguageAttribute @"AXLanguage" #define NSAccessibilityLanguageAttribute @"AXLanguage"
#endif #endif
@ -163,7 +163,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
bool content::IsAXTextMarker(id object) { bool content::IsAXTextMarker(id object) {
if (object == nil) if (object == nil)
return false; return false;
@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -770,6 +775,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
kCFAllocatorDefault, anchor_textmarker, focus_textmarker); kCFAllocatorDefault, anchor_textmarker, focus_textmarker);
return [static_cast<id>(cf_marker_range) autorelease]; return [static_cast<id>(cf_marker_range) autorelease];
} }
@ -171,7 +171,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
@implementation BrowserAccessibilityCocoa @implementation BrowserAccessibilityCocoa
@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -807,7 +813,9 @@ + (void)initialize {
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
{NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"},
{NSAccessibilityEnabledAttribute, @"enabled"}, {NSAccessibilityEnabledAttribute, @"enabled"},
@ -181,7 +181,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
{NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityExpandedAttribute, @"expanded"},
{NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
{NSAccessibilityFocusedAttribute, @"focused"}, {NSAccessibilityFocusedAttribute, @"focused"},
@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -819,8 +827,10 @@ + (void)initialize {
{NSAccessibilityHighestEditableAncestorAttribute, {NSAccessibilityHighestEditableAncestorAttribute,
@"highestEditableAncestor"}, @"highestEditableAncestor"},
{NSAccessibilityIndexAttribute, @"index"}, {NSAccessibilityIndexAttribute, @"index"},
@ -192,7 +192,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
{NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityInvalidAttribute, @"invalid"},
{NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"},
{NSAccessibilityLanguageAttribute, @"language"}, {NSAccessibilityLanguageAttribute, @"language"},
@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -842,13 +852,17 @@ + (void)initialize {
{NSAccessibilityRowsAttribute, @"rows"}, {NSAccessibilityRowsAttribute, @"rows"},
// TODO(aboxhall): expose // TODO(aboxhall): expose
// NSAccessibilityServesAsTitleForUIElementsAttribute // NSAccessibilityServesAsTitleForUIElementsAttribute
@ -210,7 +210,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
{NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySizeAttribute, @"size"},
{NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
{NSAccessibilitySubroleAttribute, @"subrole"}, {NSAccessibilitySubroleAttribute, @"subrole"},
@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -1336,6 +1350,7 @@ - (NSNumber*)enabled {
ax::mojom::Restriction::kDisabled]; ax::mojom::Restriction::kDisabled];
} }
@ -218,7 +218,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Returns a text marker that points to the last character in the document that // Returns a text marker that points to the last character in the document that
// can be selected with VoiceOver. // can be selected with VoiceOver.
- (id)endTextMarker { - (id)endTextMarker {
@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -1346,6 +1361,7 @@ - (id)endTextMarker {
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
} }
@ -226,7 +226,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
- (NSNumber*)expanded { - (NSNumber*)expanded {
if (![self instanceActive]) if (![self instanceActive])
@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -1495,6 +1511,8 @@ - (NSNumber*)index {
return nil; return nil;
} }
@ -235,7 +235,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
- (NSNumber*)insertionPointLineNumber { - (NSNumber*)insertionPointLineNumber {
if (![self instanceActive]) if (![self instanceActive])
return nil; return nil;
@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -1517,6 +1535,7 @@ - (NSNumber*)insertionPointLineNumber {
caretPosition->AsTextPosition()->text_offset()); caretPosition->AsTextPosition()->text_offset());
return @(std::distance(lineBreaks.begin(), iterator)); return @(std::distance(lineBreaks.begin(), iterator));
} }
@ -243,7 +243,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Returns whether or not this node should be ignored in the // Returns whether or not this node should be ignored in the
// accessibility tree. // accessibility tree.
@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2193,6 +2212,7 @@ - (NSArray*)selectedChildren {
return ret; return ret;
} }
@ -251,7 +251,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
- (NSString*)selectedText { - (NSString*)selectedText {
if (![self instanceActive]) if (![self instanceActive])
return nil; return nil;
@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2204,11 +2224,13 @@ - (NSString*)selectedText {
return nil; return nil;
return base::SysUTF16ToNSString(range.GetText()); return base::SysUTF16ToNSString(range.GetText());
} }
@ -265,7 +265,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
- (NSValue*)selectedTextRange { - (NSValue*)selectedTextRange {
if (![self instanceActive]) if (![self instanceActive])
return nil; return nil;
@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2229,12 +2251,15 @@ - (NSValue*)selectedTextRange {
int selLength = range.GetText().length(); int selLength = range.GetText().length();
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
} }
@ -281,7 +281,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
- (NSValue*)size { - (NSValue*)size {
if (![self instanceActive]) if (![self instanceActive])
@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2267,6 +2292,7 @@ - (NSString*)sortDirection {
return nil; return nil;
} }
@ -289,7 +289,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Returns a text marker that points to the first character in the document that // Returns a text marker that points to the first character in the document that
// can be selected with VoiceOver. // can be selected with VoiceOver.
- (id)startTextMarker { - (id)startTextMarker {
@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2277,6 +2303,7 @@ - (id)startTextMarker {
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
} }
@ -297,7 +297,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
// Returns a subrole based upon the role. // Returns a subrole based upon the role.
- (NSString*)subrole { - (NSString*)subrole {
@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2599,11 +2626,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
NSMutableAttributedString* attributedInnerText = NSMutableAttributedString* attributedInnerText =
[[[NSMutableAttributedString alloc] [[[NSMutableAttributedString alloc]
initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; initWithString:base::SysUTF16ToNSString(innerText)] autorelease];
@ -311,7 +311,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
return [attributedInnerText attributedSubstringFromRange:range]; return [attributedInnerText attributedSubstringFromRange:range];
} }
@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -2707,9 +2736,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return ToBrowserAccessibilityCocoa(cell); return ToBrowserAccessibilityCocoa(cell);
} }
@ -323,7 +323,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
BrowserAccessibilityPositionInstance position = BrowserAccessibilityPositionInstance position =
CreatePositionFromTextMarker(parameter); CreatePositionFromTextMarker(parameter);
if (!position->IsNullPosition()) if (!position->IsNullPosition())
@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -3022,6 +3050,7 @@ AXPlatformRange range(std::move(lineStartPosition),
return CreateTextMarker(root->CreatePositionAt(index)); return CreateTextMarker(root->CreatePositionAt(index));
} }
@ -331,7 +331,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
if ([attribute isEqualToString: if ([attribute isEqualToString:
NSAccessibilityBoundsForRangeParameterizedAttribute]) { NSAccessibilityBoundsForRangeParameterizedAttribute]) {
@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -3057,6 +3086,7 @@ AXPlatformRange range(std::move(lineStartPosition),
return nil; return nil;
} }
@ -339,7 +339,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
if ([attribute if ([attribute
isEqualToString: isEqualToString:
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { @@ -3171,6 +3201,7 @@ AXPlatformRange range(std::move(lineStartPosition),
return @(child->GetIndexInParent()); return @(child->GetIndexInParent());
} }
@ -351,7 +351,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm
index aaf53dd214037f103ea7399d0702b1e2ffff1b56..5972939a070908521e82845b084d2d3b9f9a73f8 100644 index aaf53dd214037f103ea7399d0702b1e2ffff1b56..5972939a070908521e82845b084d2d3b9f9a73f8 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -527,6 +527,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: @@ -527,6 +527,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:native_focus_object [user_info setObject:native_focus_object
forKey:NSAccessibilityTextChangeElement]; forKey:NSAccessibilityTextChangeElement];
@ -359,7 +359,7 @@ index aaf53dd214037f103ea7399d0702b1e2ffff1b56..5972939a070908521e82845b084d2d3b
id selected_text = [native_focus_object selectedTextMarkerRange]; id selected_text = [native_focus_object selectedTextMarkerRange];
if (selected_text) { if (selected_text) {
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
@@ -534,6 +535,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: @@ -534,6 +535,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:selected_text [user_info setObject:selected_text
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
} }
@ -383,7 +383,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a
namespace content { namespace content {
@@ -22,6 +24,7 @@ namespace { @@ -22,6 +24,7 @@
// verifies there are no existing open connections), and then indicates that // verifies there are no existing open connections), and then indicates that
// Chrome should continue execution without access to launchservicesd. // Chrome should continue execution without access to launchservicesd.
void DisableSystemServices() { void DisableSystemServices() {
@ -411,7 +411,7 @@ index 3aec8bc1fe1a619f2c4ec42ef438ae49fe0f5812..76dc23dfa26beb3b92bd87eb60fe3868
extern "C" { extern "C" {
// Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and
// `Karabiner` [3] to programmatically control the Bluetooth state. Calling the // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the
@@ -49,6 +50,7 @@ extern "C" { @@ -49,6 +50,7 @@
// [4] https://support.apple.com/kb/PH25091 // [4] https://support.apple.com/kb/PH25091
void IOBluetoothPreferenceSetControllerPowerState(int state); void IOBluetoothPreferenceSetControllerPowerState(int state);
} }
@ -419,7 +419,7 @@ index 3aec8bc1fe1a619f2c4ec42ef438ae49fe0f5812..76dc23dfa26beb3b92bd87eb60fe3868
namespace { namespace {
@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac() @@ -118,8 +120,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
controller_state_function_( controller_state_function_(
base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
base::Unretained(this))), base::Unretained(this))),
@ -430,7 +430,7 @@ index 3aec8bc1fe1a619f2c4ec42ef438ae49fe0f5812..76dc23dfa26beb3b92bd87eb60fe3868
should_update_name_(true), should_update_name_(true),
classic_discovery_manager_( classic_discovery_manager_(
BluetoothDiscoveryManagerMac::CreateClassic(this)), BluetoothDiscoveryManagerMac::CreateClassic(this)),
@@ -306,8 +310,12 @@ base::WeakPtr<BluetoothAdapter> BluetoothAdapterMac::GetWeakPtr() { @@ -306,8 +310,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
} }
bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {

8
patches/chromium/render_widget_host_view_mac.patch
View file

@ -25,7 +25,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669
// These are not documented, so use only after checking -respondsToSelector:. // These are not documented, so use only after checking -respondsToSelector:.
@interface NSApplication (UndocumentedSpeechMethods) @interface NSApplication (UndocumentedSpeechMethods)
- (void)speakString:(NSString*)string; - (void)speakString:(NSString*)string;
@@ -645,6 +650,9 @@ void ExtractUnderlines(NSAttributedString* string, @@ -645,6 +650,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
} }
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent { - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@ -35,7 +35,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669
return [self acceptsMouseEventsWhenInactive]; return [self acceptsMouseEventsWhenInactive];
} }
@@ -1078,6 +1086,10 @@ void ExtractUnderlines(NSAttributedString* string, @@ -1078,6 +1086,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
eventType == NSKeyDown && eventType == NSKeyDown &&
!(modifierFlags & NSCommandKeyMask); !(modifierFlags & NSCommandKeyMask);
@ -46,7 +46,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669
// We only handle key down events and just simply forward other events. // We only handle key down events and just simply forward other events.
if (eventType != NSKeyDown) { if (eventType != NSKeyDown) {
_hostHelper->ForwardKeyboardEvent(event, latency_info); _hostHelper->ForwardKeyboardEvent(event, latency_info);
@@ -1854,9 +1866,11 @@ void ExtractUnderlines(NSAttributedString* string, @@ -1854,9 +1866,11 @@ - (NSAccessibilityRole)accessibilityRole {
// Since this implementation doesn't have to wait any IPC calls, this doesn't // Since this implementation doesn't have to wait any IPC calls, this doesn't
// make any key-typing jank. --hbono 7/23/09 // make any key-typing jank. --hbono 7/23/09
// //
@ -58,7 +58,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669
- (NSArray*)validAttributesForMarkedText { - (NSArray*)validAttributesForMarkedText {
// This code is just copied from WebKit except renaming variables. // This code is just copied from WebKit except renaming variables.
@@ -1865,7 +1879,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName; @@ -1865,7 +1879,10 @@ - (NSArray*)validAttributesForMarkedText {
initWithObjects:NSUnderlineStyleAttributeName, initWithObjects:NSUnderlineStyleAttributeName,
NSUnderlineColorAttributeName, NSUnderlineColorAttributeName,
NSMarkedClauseSegmentAttributeName, NSMarkedClauseSegmentAttributeName,

2
patches/chromium/webview_cross_drag.patch
View file

@ -26,7 +26,7 @@ diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser
index a964f38b830f62bf694646033e1c24e0cf4557c5..61e69fdebaca038d09b5ebab71fd20e2e13188f0 100644 index a964f38b830f62bf694646033e1c24e0cf4557c5..61e69fdebaca038d09b5ebab71fd20e2e13188f0 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm --- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -384,9 +384,7 @@ void DropCompletionCallback( @@ -384,9 +384,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
} }
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {

2
patches/squirrel.mac/fix_ensure_that_self_is_retained_until_the_racsignal_is_complete.patch
View file

@ -9,7 +9,7 @@ diff --git a/Squirrel/SQRLZipArchiver.m b/Squirrel/SQRLZipArchiver.m
index 478509cdd528db4fcfa340c6f93fa58a446957e6..7c279bf73c368453bff4f922d76908c06dc378cd 100644 index 478509cdd528db4fcfa340c6f93fa58a446957e6..7c279bf73c368453bff4f922d76908c06dc378cd 100644
--- a/Squirrel/SQRLZipArchiver.m --- a/Squirrel/SQRLZipArchiver.m
+++ b/Squirrel/SQRLZipArchiver.m +++ b/Squirrel/SQRLZipArchiver.m
@@ -134,7 +134,7 @@ const NSInteger SQRLZipArchiverShellTaskFailed = 1; @@ -134,7 +134,7 @@ - (RACSignal *)launchWithArguments:(NSArray *)arguments {
return [RACSignal return [RACSignal
zip:@[ self.taskTerminated, self.standardErrorData ] zip:@[ self.taskTerminated, self.standardErrorData ]
reduce:^(NSNumber *exitStatus, NSData *errorData) { reduce:^(NSNumber *exitStatus, NSData *errorData) {