|
@@ -35,10 +35,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to
|
|
|
system priority.
|
|
|
|
|
|
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
|
|
-index 2bfdc528e67aa6c869ef48c6b8e5f239c3d9559b..54c34b480c7a10d1fbf0137dcea05226911406cd 100644
|
|
|
+index dbaf22d68f67cb227a5fc2c774fd582af7715dcc..406bc05f8f4b368f18c6e8264fa5ad6e70d6fe1e 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
-@@ -1048,6 +1048,7 @@ component("base") {
|
|
|
+@@ -1050,6 +1050,7 @@ component("base") {
|
|
|
"//build/config/compiler:prevent_unsafe_narrowing",
|
|
|
"//build/config/compiler:wexit_time_destructors",
|
|
|
"//build/config/compiler:wglobal_constructors",
|
|
@@ -73,7 +73,7 @@ index 4bf9a3c27e05c6635b2beb8e880b5b43dbed61b5..57d4756c0d87b9313e8566b3083c0132
|
|
|
|
|
|
} // namespace base
|
|
|
diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
|
|
|
-index d1b09cb1a75000cf41f31bddcdcb739f776920aa..825a6ecd65bc4e3412db83413d6de34ea997ddd0 100644
|
|
|
+index 2512b3f43b6ac84dd2a440ac3e68d282c7e429d9..2cb281abf2cc3bd800a2349e41a59454db6da953 100644
|
|
|
--- a/base/process/launch_mac.cc
|
|
|
+++ b/base/process/launch_mac.cc
|
|
|
@@ -21,13 +21,18 @@
|
|
@@ -171,7 +171,7 @@ index 4fe7a0bfaa5b3398372f55c6454e738f140efe6b..b1c70281c45aaca4ae483f1f28e9d219
|
|
|
|
|
|
if (is_win) {
|
|
|
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
-index 459f14da45419a2a0340199d9cf311e3bba437e6..3b7908c559ddd3d6101801f8de256aa80a9411a2 100644
|
|
|
+index bc054fb378181210794a1b3453f7c14443da0dab..b9690bbdd2d126c09396c02a8cae5d91bab6bcd4 100644
|
|
|
--- a/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
+++ b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
@@ -16,6 +16,7 @@ component("app_shim") {
|
|
@@ -303,10 +303,10 @@ index 945b01f2132547fa0f6a97ee4895994c500d1410..c01b2fdecf9b54fa01e5be9f45eaa234
|
|
|
// 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 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a91334c093c1a 100644
|
|
|
+index 4f37e077120a311638c64e715059e5c08b1f1045..30027aafc16d48ac076dca3223f3a38dc6c8e85e 100644
|
|
|
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
|
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
|
-@@ -106,14 +106,18 @@ void OrderChildWindow(NSWindow* child_window,
|
|
|
+@@ -111,14 +111,18 @@ void OrderChildWindow(NSWindow* child_window,
|
|
|
|
|
|
} // namespace
|
|
|
|
|
@@ -325,7 +325,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
|
|
|
- (BOOL)hasKeyAppearance;
|
|
|
- (long long)_resizeDirectionForMouseLocation:(CGPoint)location;
|
|
|
- (BOOL)_isConsideredOpenForPersistentState;
|
|
|
-@@ -152,6 +156,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
|
|
|
+@@ -157,6 +161,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
|
|
|
}
|
|
|
@end
|
|
|
|
|
@@ -334,7 +334,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
|
|
|
@implementation NativeWidgetMacNSWindowTitledFrame
|
|
|
- (void)mouseDown:(NSEvent*)event {
|
|
|
if (self.window.isMovable)
|
|
|
-@@ -214,6 +220,8 @@ - (BOOL)usesCustomDrawing {
|
|
|
+@@ -219,6 +225,8 @@ - (BOOL)usesCustomDrawing {
|
|
|
}
|
|
|
@end
|
|
|
|
|
@@ -343,7 +343,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
|
|
|
@implementation NativeWidgetMacNSWindow {
|
|
|
@private
|
|
|
CommandDispatcher* __strong _commandDispatcher;
|
|
|
-@@ -402,6 +410,8 @@ - (NSAccessibilityRole)accessibilityRole {
|
|
|
+@@ -409,6 +417,8 @@ - (NSAccessibilityRole)accessibilityRole {
|
|
|
|
|
|
// NSWindow overrides.
|
|
|
|
|
@@ -352,7 +352,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
|
|
|
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
|
if (windowStyle & NSWindowStyleMaskTitled) {
|
|
|
if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
|
|
|
-@@ -413,6 +423,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
|
+@@ -420,6 +430,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
|
return [super frameViewClassForStyleMask:windowStyle];
|
|
|
}
|
|
|
|
|
@@ -468,7 +468,7 @@ index 00493dc6c3f0229438b440a6fb2438ca668aba6b..6ce251058868529551cd6f008f840e06
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index 3c60d828a0a4822f2807c89083f20dbf32aeea86..537c1cddc964748f8b978d1b4fa6f5a6c45ebf08 100644
|
|
|
+index e784717f1e6aac06a28f39e70115aa9e63a43859..68b325f7d504571b81a13877654d1b1852057417 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
@@ -70,6 +70,7 @@ source_set("browser") {
|
|
@@ -480,7 +480,7 @@ index 3c60d828a0a4822f2807c89083f20dbf32aeea86..537c1cddc964748f8b978d1b4fa6f5a6
|
|
|
libs = []
|
|
|
frameworks = []
|
|
|
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
-index 9485916338d16e11acbb56ea0b9b34e749db0281..45df87ec3bd98474513cef590b8312f8bd976947 100644
|
|
|
+index 66aeabc0852b61777dee72dc819cab7fd59b6563..fc09cd942b60a5eea7e35842f031e3259509095d 100644
|
|
|
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
@@ -20,7 +20,9 @@
|
|
@@ -493,7 +493,7 @@ index 9485916338d16e11acbb56ea0b9b34e749db0281..45df87ec3bd98474513cef590b8312f8
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
-@@ -224,6 +226,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
+@@ -229,6 +231,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -501,7 +501,7 @@ index 9485916338d16e11acbb56ea0b9b34e749db0281..45df87ec3bd98474513cef590b8312f8
|
|
|
BrowserAccessibilityManager* root_manager = GetManagerForRootFrame();
|
|
|
if (root_manager) {
|
|
|
BrowserAccessibilityManagerMac* root_manager_mac =
|
|
|
-@@ -246,6 +249,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
+@@ -251,6 +254,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
@@ -509,7 +509,7 @@ index 9485916338d16e11acbb56ea0b9b34e749db0281..45df87ec3bd98474513cef590b8312f8
|
|
|
|
|
|
// Use native VoiceOver support for live regions.
|
|
|
BrowserAccessibilityCocoa* retained_node = native_node;
|
|
|
-@@ -646,6 +650,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
+@@ -642,6 +646,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
return window == [NSApp accessibilityFocusedWindow];
|
|
|
}
|
|
|
|
|
@@ -517,7 +517,7 @@ index 9485916338d16e11acbb56ea0b9b34e749db0281..45df87ec3bd98474513cef590b8312f8
|
|
|
// TODO(accessibility): We need a solution to the problem described below.
|
|
|
// If the window is NSAccessibilityRemoteUIElement, there are some challenges:
|
|
|
// 1. NSApp is the browser which spawned the PWA, and what it considers the
|
|
|
-@@ -674,6 +679,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
+@@ -670,6 +675,7 @@ void PostAnnouncementNotification(NSString* announcement,
|
|
|
if ([window isKindOfClass:[NSAccessibilityRemoteUIElement class]]) {
|
|
|
return true;
|
|
|
}
|
|
@@ -526,7 +526,7 @@ index 9485916338d16e11acbb56ea0b9b34e749db0281..45df87ec3bd98474513cef590b8312f8
|
|
|
return false;
|
|
|
}
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
|
|
|
-index a9c8c574b83c78988016e38931ab7273e426c6fd..1f23d45ca2d9fd09b2f88f61f9daeecee9f9b445 100644
|
|
|
+index a4f19d10fdcb6cf09272bb7ef4e0290fa2d8239b..19dfbbfea9ace18e53b1de64066ffb161fa845cc 100644
|
|
|
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
|
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
|
|
|
@@ -53,7 +53,9 @@ class CursorManager;
|
|
@@ -539,7 +539,7 @@ index a9c8c574b83c78988016e38931ab7273e426c6fd..1f23d45ca2d9fd09b2f88f61f9daeece
|
|
|
@class RenderWidgetHostViewCocoa;
|
|
|
@class CursorAccessibilityScaleFactorObserver;
|
|
|
|
|
|
-@@ -686,9 +688,11 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
|
|
|
+@@ -685,9 +687,11 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
|
|
|
// EnsureSurfaceSynchronizedForWebTest().
|
|
|
uint32_t latest_capture_sequence_number_ = 0u;
|
|
|
|
|
@@ -552,7 +552,7 @@ index a9c8c574b83c78988016e38931ab7273e426c6fd..1f23d45ca2d9fd09b2f88f61f9daeece
|
|
|
// Used to force the NSApplication's focused accessibility element to be the
|
|
|
// content::BrowserAccessibilityCocoa accessibility tree when the NSView for
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
|
|
-index 4aa1a1479d7b8b9129c4e88bb0c416792515d3f6..362b8c764317815dd69f7339b6d1eb614bc4fa16 100644
|
|
|
+index 9f7b35dc9d0fd6190f689c3e7aa9e730a27e8e8c..fd3eeb9f52367e0c0fca33b82036290d02d4ca0d 100644
|
|
|
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
|
|
@@ -272,8 +272,10 @@
|
|
@@ -566,7 +566,7 @@ index 4aa1a1479d7b8b9129c4e88bb0c416792515d3f6..362b8c764317815dd69f7339b6d1eb61
|
|
|
|
|
|
// Reset `ns_view_` before resetting `remote_ns_view_` to avoid dangling
|
|
|
// pointers. `ns_view_` gets reinitialized later in this method.
|
|
|
-@@ -1657,8 +1659,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
|
|
|
+@@ -1636,8 +1638,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
|
|
|
|
|
|
gfx::NativeViewAccessible
|
|
|
RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
|
|
@@ -577,7 +577,7 @@ index 4aa1a1479d7b8b9129c4e88bb0c416792515d3f6..362b8c764317815dd69f7339b6d1eb61
|
|
|
return [GetInProcessNSView() window];
|
|
|
}
|
|
|
|
|
|
-@@ -1707,9 +1711,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
|
|
|
+@@ -1686,9 +1690,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
|
|
|
}
|
|
|
|
|
|
void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
|
|
@@ -589,7 +589,7 @@ index 4aa1a1479d7b8b9129c4e88bb0c416792515d3f6..362b8c764317815dd69f7339b6d1eb61
|
|
|
}
|
|
|
|
|
|
bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
|
|
|
-@@ -2233,20 +2239,26 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
|
|
|
+@@ -2212,20 +2218,26 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
|
|
|
void RenderWidgetHostViewMac::GetRenderWidgetAccessibilityToken(
|
|
|
GetRenderWidgetAccessibilityTokenCallback callback) {
|
|
|
base::ProcessId pid = getpid();
|
|
@@ -629,10 +629,10 @@ index 0738636a7462fd973c12d0e26e298c3b767f0c53..977e90c5dc3d8ff48ba9674c1c7d5eb6
|
|
|
public_deps = [
|
|
|
":mojo_bindings",
|
|
|
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
|
|
|
-index dd68249de75a27f91bb421cb37d9ca4153f41506..a518d0b2aae815047acd34558d6ee014072d601f 100644
|
|
|
+index aa858c2dd7594798e7b8d1a947fb85b0eb506710..8e9c678f9af71175c842343e3fd19b2c2cce1416 100644
|
|
|
--- a/content/renderer/BUILD.gn
|
|
|
+++ b/content/renderer/BUILD.gn
|
|
|
-@@ -230,6 +230,7 @@ target(link_target_type, "renderer") {
|
|
|
+@@ -232,6 +232,7 @@ target(link_target_type, "renderer") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//content:content_implementation" ]
|
|
@@ -709,7 +709,7 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index 52ffda780d5df5f8788bea200943672708437c3e..75868558b22eed8a86d557dbafdc6184f254c180 100644
|
|
|
+index cfcc4bc7fbcc6209c86f07ae1b6e920c5258173c..18395806b05c7deef7a0415031c376f7c2239bfd 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
@@ -502,6 +502,7 @@ static_library("test_support") {
|
|
@@ -728,7 +728,7 @@ index 52ffda780d5df5f8788bea200943672708437c3e..75868558b22eed8a86d557dbafdc6184
|
|
|
}
|
|
|
|
|
|
mojom("content_test_mojo_bindings") {
|
|
|
-@@ -1718,6 +1720,7 @@ test("content_browsertests") {
|
|
|
+@@ -1717,6 +1719,7 @@ test("content_browsertests") {
|
|
|
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
|
|
|
|
|
|
configs += [ "//build/config:precompiled_headers" ]
|
|
@@ -736,7 +736,7 @@ index 52ffda780d5df5f8788bea200943672708437c3e..75868558b22eed8a86d557dbafdc6184
|
|
|
|
|
|
public_deps = [
|
|
|
":test_interfaces",
|
|
|
-@@ -2973,6 +2976,7 @@ test("content_unittests") {
|
|
|
+@@ -2975,6 +2978,7 @@ test("content_unittests") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//build/config:precompiled_headers" ]
|
|
@@ -840,10 +840,10 @@ index 36322ddd3047f96569f35807541a37d3c6672b09..3162cb6e3dce2c44e5b1e5f33f9177da
|
|
|
|
|
|
namespace ui {
|
|
|
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
|
|
|
-index 90e093cd2d499ba0f37f3246bab288c758b51e19..6027134a4de53e6fe39fdbfdb67885e0b5f56e40 100644
|
|
|
+index 6f3b368103b05f07ae67da4c0307efe039b8dfce..a1b11c298ee8b2c9b3cbe6307bc7744c242976b6 100644
|
|
|
--- a/media/audio/BUILD.gn
|
|
|
+++ b/media/audio/BUILD.gn
|
|
|
-@@ -199,6 +199,7 @@ source_set("audio") {
|
|
|
+@@ -197,6 +197,7 @@ source_set("audio") {
|
|
|
"CoreMedia.framework",
|
|
|
]
|
|
|
weak_frameworks = [ "ScreenCaptureKit.framework" ] # macOS 13.0
|
|
@@ -852,10 +852,10 @@ index 90e093cd2d499ba0f37f3246bab288c758b51e19..6027134a4de53e6fe39fdbfdb67885e0
|
|
|
|
|
|
if (is_ios) {
|
|
|
diff --git a/media/audio/apple/audio_low_latency_input.cc b/media/audio/apple/audio_low_latency_input.cc
|
|
|
-index 808f4e1c7beb03cc5377465882940eea94ad61a7..d001436c3a5a8a0fc25995519772478f04ddb35f 100644
|
|
|
+index 9b78f60304a0e487904fdb22c9e6d85a237ca96e..fc5508c41aa08dd7bf1365a7c03b68723aae3a4b 100644
|
|
|
--- a/media/audio/apple/audio_low_latency_input.cc
|
|
|
+++ b/media/audio/apple/audio_low_latency_input.cc
|
|
|
-@@ -34,19 +34,23 @@
|
|
|
+@@ -39,19 +39,23 @@
|
|
|
|
|
|
namespace {
|
|
|
extern "C" {
|
|
@@ -879,19 +879,6 @@ index 808f4e1c7beb03cc5377465882940eea94ad61a7..d001436c3a5a8a0fc25995519772478f
|
|
|
}
|
|
|
} // namespace
|
|
|
#endif
|
|
|
-diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
|
|
|
-index a5070091785d80a47d1d9d9977803cd1de8b2054..b280a0d58fc03257aa1763cd15791db4ddede7c1 100644
|
|
|
---- a/media/audio/mac/audio_manager_mac.cc
|
|
|
-+++ b/media/audio/mac/audio_manager_mac.cc
|
|
|
-@@ -971,7 +971,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
|
|
|
-
|
|
|
- void AudioManagerMac::InitializeOnAudioThread() {
|
|
|
- DCHECK(GetTaskRunner()->BelongsToCurrentThread());
|
|
|
-- InitializeCoreAudioDispatchOverride();
|
|
|
-+ // InitializeCoreAudioDispatchOverride();
|
|
|
- power_observer_ = std::make_unique<AudioPowerObserver>();
|
|
|
- }
|
|
|
-
|
|
|
diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn
|
|
|
index 5f4ff9ff8172d4ad282cc9c781f85118b8ba7d1a..6a542c8f0d7afad876ab2739a1a2576a64cb6be9 100644
|
|
|
--- a/net/dns/BUILD.gn
|
|
@@ -1394,22 +1381,22 @@ index dcf493d62990018040a3f84b6f875af737bd2214..6ffffe8b3946e0427aead8be19878c53
|
|
|
|
|
|
void DisplayCALayerTree::GotIOSurfaceFrame(
|
|
|
diff --git a/ui/accessibility/platform/BUILD.gn b/ui/accessibility/platform/BUILD.gn
|
|
|
-index b7f86265ef2c79ce7a0c3eda2443a01a0242af89..96b8b4976ada0fcb2fd322e2ea42429a3c0757db 100644
|
|
|
+index 9803795cb3567ee4ae94927f4d46a5d53cd63ed1..41fc650b36349eaebd571a814ed27776c1ee1c0c 100644
|
|
|
--- a/ui/accessibility/platform/BUILD.gn
|
|
|
+++ b/ui/accessibility/platform/BUILD.gn
|
|
|
-@@ -255,6 +255,7 @@ component("platform") {
|
|
|
- weak_frameworks = [
|
|
|
- "Accessibility.framework", # macOS 11
|
|
|
+@@ -254,6 +254,7 @@ component("platform") {
|
|
|
+ "AppKit.framework",
|
|
|
+ "Foundation.framework",
|
|
|
]
|
|
|
+ configs += ["//electron/build/config:mas_build"]
|
|
|
}
|
|
|
|
|
|
if (is_ios) {
|
|
|
diff --git a/ui/accessibility/platform/inspect/ax_transform_mac.mm b/ui/accessibility/platform/inspect/ax_transform_mac.mm
|
|
|
-index 84e156b7ff28abc2071dde155e56a2a92a53b142..bd73dac7fe3ed256cab805a0815d31d4f5e7dffc 100644
|
|
|
+index c8171f0527fe5194f0ea73b57c4444d4c630fbc4..7fa66598f2a541600602af47b3e1ed7b5d4463ee 100644
|
|
|
--- a/ui/accessibility/platform/inspect/ax_transform_mac.mm
|
|
|
+++ b/ui/accessibility/platform/inspect/ax_transform_mac.mm
|
|
|
-@@ -108,6 +108,7 @@
|
|
|
+@@ -111,6 +111,7 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1417,7 +1404,7 @@ index 84e156b7ff28abc2071dde155e56a2a92a53b142..bd73dac7fe3ed256cab805a0815d31d4
|
|
|
// AXTextMarker
|
|
|
if (IsAXTextMarker(value)) {
|
|
|
return AXTextMarkerToBaseValue(value, indexer);
|
|
|
-@@ -117,6 +118,7 @@
|
|
|
+@@ -120,6 +121,7 @@
|
|
|
if (IsAXTextMarkerRange(value)) {
|
|
|
return AXTextMarkerRangeToBaseValue(value, indexer);
|
|
|
}
|
|
@@ -1541,10 +1528,10 @@ index 9fb3bee897513d262ac44dccfe6662cc145a8df7..5b7592d7f739b5e580429a69575e6df5
|
|
|
|
|
|
if (is_win) {
|
|
|
diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
|
|
|
-index cd08cb3b7c95a8fd418524652bb345945291112a..13c6cc142262781450d1075fe85f86ada3f9f60f 100644
|
|
|
+index 592e9611f6315f6f96918ee0a6489c38d6fa49e8..e885e86126429e7ae42991b6bd7a78bd4c9f96a7 100644
|
|
|
--- a/ui/display/mac/screen_mac.mm
|
|
|
+++ b/ui/display/mac/screen_mac.mm
|
|
|
-@@ -171,7 +171,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
|
|
|
+@@ -176,7 +176,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
|
|
|
display.set_color_depth(Display::kDefaultBitsPerPixel);
|
|
|
display.set_depth_per_component(Display::kDefaultBitsPerComponent);
|
|
|
}
|