|
@@ -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 99d5767a59455484f9c5c058e216654ad7780aac..5df91947dac1c23d3153d4b0b5aab3d735aa1ab5 100644
|
|
|
+index 3934ff75fa9f0841d062f00e52a1ccb9af327177..a0c81d907db6143e11de04ebfa7f629c7e11911c 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
-@@ -1031,6 +1031,7 @@ component("base") {
|
|
|
+@@ -1028,6 +1028,7 @@ component("base") {
|
|
|
"//build:ios_buildflags",
|
|
|
"//build/config/compiler:compiler_buildflags",
|
|
|
"//third_party/modp_b64",
|
|
@@ -141,18 +141,17 @@ index 1baeaec5125bbdc19dccbd18c8702f291ccc71ba..613c644eda45c7e4bf1a7a06dad6d8b4
|
|
|
if (options.disclaim_responsibility) {
|
|
|
DPSXCHECK(responsibility_spawnattrs_setdisclaim(attr.get(), 1));
|
|
|
}
|
|
|
-diff --git a/base/process/process_info_mac.cc b/base/process/process_info_mac.cc
|
|
|
-index 94a028be3c315edc0056408ab9ab41b6b001a1c1..abf9003bc71506d389ff77dc708c897113bba412 100644
|
|
|
---- a/base/process/process_info_mac.cc
|
|
|
-+++ b/base/process/process_info_mac.cc
|
|
|
-@@ -4,19 +4,27 @@
|
|
|
+diff --git a/base/process/process_info_mac.mm b/base/process/process_info_mac.mm
|
|
|
+index e12c1d078147d956a1d9b1bc498c1b1d6fe7b974..233362259dc4e728ed37435e650417647b45a6af 100644
|
|
|
+--- a/base/process/process_info_mac.mm
|
|
|
++++ b/base/process/process_info_mac.mm
|
|
|
+@@ -4,15 +4,20 @@
|
|
|
|
|
|
#include "base/process/process_info.h"
|
|
|
|
|
|
+#include "electron/mas.h"
|
|
|
+
|
|
|
- #include <stdio.h>
|
|
|
- #include <stdlib.h>
|
|
|
+ #import <AppKit/AppKit.h>
|
|
|
#include <unistd.h>
|
|
|
|
|
|
+#if !IS_MAS_BUILD()
|
|
@@ -161,12 +160,31 @@ index 94a028be3c315edc0056408ab9ab41b6b001a1c1..abf9003bc71506d389ff77dc708c8971
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
+ namespace {
|
|
|
+
|
|
|
++#if !IS_MAS_BUILD()
|
|
|
+ bool AppContainsBluetoothUsageDescription(NSRunningApplication* app) {
|
|
|
+ NSURL* bundle_url = app.bundleURL;
|
|
|
+ if (!bundle_url) {
|
|
|
+@@ -24,12 +29,14 @@ bool AppContainsBluetoothUsageDescription(NSRunningApplication* app) {
|
|
|
+ [bundle objectForInfoDictionaryKey:@"NSBluetoothAlwaysUsageDescription"];
|
|
|
+ return bluetooth_entry != nil;
|
|
|
+ }
|
|
|
++#endif
|
|
|
+
|
|
|
+ } // namespace
|
|
|
+
|
|
|
namespace base {
|
|
|
|
|
|
- bool IsProcessSelfResponsible() {
|
|
|
+ bool DoesResponsibleProcessHaveBluetoothMetadata() {
|
|
|
+#if !IS_MAS_BUILD()
|
|
|
const pid_t pid = getpid();
|
|
|
- return responsibility_get_pid_responsible_for_pid(pid) == pid;
|
|
|
+ const pid_t responsible_pid = responsibility_get_pid_responsible_for_pid(pid);
|
|
|
+ // Returns true directly if this is a self-responsible app(e.g. Chrome opens
|
|
|
+@@ -46,6 +53,9 @@ bool DoesResponsibleProcessHaveBluetoothMetadata() {
|
|
|
+ return AppContainsBluetoothUsageDescription(app);
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+#else
|
|
|
+ return true;
|
|
|
+#endif
|
|
@@ -199,7 +217,7 @@ index d87682447b850e4cf9065f0d26d14077acbe467d..a179c9bc02158130f4b15bf8022721f4
|
|
|
using crypto::AppleKeychain;
|
|
|
|
|
|
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
-index da8b246916811fbee1e63d0aa95be9fa3ae12bfb..3bcd78507a15bb12ffe71a5f67e756000ca2633a 100644
|
|
|
+index ad40ddbbcb0fcfa070833ea6c0d01432bbb67768..df632da340c132f469f4f35738514763437e67fc 100644
|
|
|
--- a/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
+++ b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
@@ -75,6 +75,7 @@ component("app_shim") {
|
|
@@ -364,7 +382,7 @@ index d55914779bc097cab8afb144f2c47c001bfa7350..e55db3f550b4c082aa087fbcab6760da
|
|
|
// 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 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6a7e8cc86 100644
|
|
|
+index 03ff0478f16f237e6b8082508d5399195bfdca44..9b74f6ca6de6ec057073e175170014b5512040b4 100644
|
|
|
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
|
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
|
@@ -26,6 +26,7 @@
|
|
@@ -372,10 +390,10 @@ index 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6
|
|
|
#import "components/remote_cocoa/app_shim/window_touch_bar_delegate.h"
|
|
|
#include "components/remote_cocoa/common/native_widget_ns_window_host.mojom.h"
|
|
|
+#include "electron/mas.h"
|
|
|
+ #include "ui/accessibility/platform/ax_platform_node.h"
|
|
|
#import "ui/base/cocoa/user_interface_item_command_handler.h"
|
|
|
#import "ui/base/cocoa/window_size_constants.h"
|
|
|
-
|
|
|
-@@ -111,14 +112,18 @@ void OrderChildWindow(NSWindow* child_window,
|
|
|
+@@ -112,14 +113,18 @@ void OrderChildWindow(NSWindow* child_window,
|
|
|
|
|
|
} // namespace
|
|
|
|
|
@@ -394,7 +412,7 @@ index 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6
|
|
|
- (BOOL)hasKeyAppearance;
|
|
|
- (long long)_resizeDirectionForMouseLocation:(CGPoint)location;
|
|
|
- (BOOL)_isConsideredOpenForPersistentState;
|
|
|
-@@ -158,6 +163,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
|
|
|
+@@ -159,6 +164,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
|
|
|
}
|
|
|
@end
|
|
|
|
|
@@ -403,7 +421,7 @@ index 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6
|
|
|
@implementation NativeWidgetMacNSWindowTitledFrame
|
|
|
- (void)mouseDown:(NSEvent*)event {
|
|
|
if (self.window.isMovable)
|
|
|
-@@ -185,6 +192,8 @@ - (BOOL)usesCustomDrawing {
|
|
|
+@@ -186,6 +193,8 @@ - (BOOL)usesCustomDrawing {
|
|
|
}
|
|
|
@end
|
|
|
|
|
@@ -412,7 +430,7 @@ index 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6
|
|
|
@implementation NativeWidgetMacNSWindow {
|
|
|
@private
|
|
|
CommandDispatcher* __strong _commandDispatcher;
|
|
|
-@@ -382,6 +391,8 @@ - (NSAccessibilityRole)accessibilityRole {
|
|
|
+@@ -383,6 +392,8 @@ - (NSAccessibilityRole)accessibilityRole {
|
|
|
|
|
|
// NSWindow overrides.
|
|
|
|
|
@@ -421,7 +439,7 @@ index 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6
|
|
|
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
|
if (windowStyle & NSWindowStyleMaskTitled) {
|
|
|
if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
|
|
|
-@@ -393,6 +404,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
|
+@@ -394,6 +405,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
|
|
|
return [super frameViewClassForStyleMask:windowStyle];
|
|
|
}
|
|
|
|
|
@@ -431,7 +449,7 @@ index 2eba7ccc91d7689d48cd990635718bec4e3dc69c..5373ee02934f706386d3dd7c863766a6
|
|
|
bool shouldShowWindowTitle = YES;
|
|
|
if (_bridge)
|
|
|
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
|
|
-index 3b8e96fbc7aa4cf1601230e81ff32cf9792be1da..6d8b41ffff28200daec6d554a5b7f1c792693105 100644
|
|
|
+index 89aca4b47c202f137a5ffe8390986ef6dd62942a..59276806afa7659573eb276149ff8ed47ca72c1f 100644
|
|
|
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
|
|
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
|
|
@@ -41,6 +41,7 @@
|
|
@@ -456,7 +474,7 @@ index 3b8e96fbc7aa4cf1601230e81ff32cf9792be1da..6d8b41ffff28200daec6d554a5b7f1c7
|
|
|
// Beware: This view was briefly removed (in favor of a bare CALayer) in
|
|
|
// https://crrev.com/c/1236675. The ordering of unassociated layers relative
|
|
|
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
|
|
|
-index f43d8a8803b801c116fe3cea31839caddf57da28..8720a29e13ce052db99a6fb7925efd4b43472b9a 100644
|
|
|
+index 3f1b98692d11116f965fe0eb7e4b6cae308a4f19..6ac941799bda10ce7f93612691a438018160a9dd 100644
|
|
|
--- a/components/viz/service/BUILD.gn
|
|
|
+++ b/components/viz/service/BUILD.gn
|
|
|
@@ -378,6 +378,7 @@ viz_component("service") {
|
|
@@ -467,7 +485,7 @@ index f43d8a8803b801c116fe3cea31839caddf57da28..8720a29e13ce052db99a6fb7925efd4b
|
|
|
}
|
|
|
|
|
|
if (is_android || use_ozone) {
|
|
|
-@@ -676,6 +677,7 @@ viz_source_set("unit_tests") {
|
|
|
+@@ -678,6 +679,7 @@ viz_source_set("unit_tests") {
|
|
|
"display_embedder/software_output_device_mac_unittest.mm",
|
|
|
]
|
|
|
frameworks = [ "IOSurface.framework" ]
|
|
@@ -527,7 +545,7 @@ index dbf334caa3a6d10017b69ad76802e389a011436b..da828823e8195cc9e497866363c9af93
|
|
|
|
|
|
void ForwardKeyboardEvent(const input::NativeWebKeyboardEvent& key_event,
|
|
|
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
|
-index 038646bfa3ac442c64380a81bdb1d3043e50c107..33f2bcae6353a527710f05aa03770136e6039449 100644
|
|
|
+index a76028eed0249244d0559de102a756e3b2771b63..cb65efb56849d57e2e656f90d5b1d737ba2d952d 100644
|
|
|
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
|
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
|
@@ -35,6 +35,7 @@
|
|
@@ -538,7 +556,7 @@ index 038646bfa3ac442c64380a81bdb1d3043e50c107..33f2bcae6353a527710f05aa03770136
|
|
|
#include "skia/ext/skia_utils_mac.h"
|
|
|
#include "third_party/blink/public/common/features.h"
|
|
|
#include "third_party/blink/public/mojom/input/input_handler.mojom.h"
|
|
|
-@@ -2078,15 +2079,21 @@ - (NSAccessibilityRole)accessibilityRole {
|
|
|
+@@ -2151,15 +2152,21 @@ - (NSAccessibilityRole)accessibilityRole {
|
|
|
// Since this implementation doesn't have to wait any IPC calls, this doesn't
|
|
|
// make any key-typing jank. --hbono 7/23/09
|
|
|
//
|
|
@@ -561,10 +579,10 @@ index 038646bfa3ac442c64380a81bdb1d3043e50c107..33f2bcae6353a527710f05aa03770136
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index 8a48699a703acd019a57916058bdd99a223306ff..6d2d9a41cfb20e469b33b9039b7ef7c293a5a400 100644
|
|
|
+index 82518ae30b39aae406d5c142af60ae4c0829786b..84adb6a2163ea44fc36c8fa95057f2bbad757093 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
-@@ -327,6 +327,7 @@ source_set("browser") {
|
|
|
+@@ -329,6 +329,7 @@ source_set("browser") {
|
|
|
"//ui/touch_selection",
|
|
|
"//ui/webui/resources",
|
|
|
"//v8:v8_version",
|
|
@@ -774,10 +792,10 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index 23858defb34c7f40458b5ec6da337b95cdeb347f..08097629fbcd4e30860157523d91d0cf069b1f9a 100644
|
|
|
+index 4b521179af8722f0a9917d1f925d9223b46e2c73..b3532822184507a2d37af607bd09aaff65fcb30f 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
-@@ -647,6 +647,7 @@ static_library("test_support") {
|
|
|
+@@ -652,6 +652,7 @@ static_library("test_support") {
|
|
|
"//url",
|
|
|
"//url/mojom:url_mojom_gurl",
|
|
|
"//v8",
|
|
@@ -785,7 +803,7 @@ index 23858defb34c7f40458b5ec6da337b95cdeb347f..08097629fbcd4e30860157523d91d0cf
|
|
|
]
|
|
|
|
|
|
data_deps = [
|
|
|
-@@ -1102,6 +1103,7 @@ static_library("browsertest_support") {
|
|
|
+@@ -1107,6 +1108,7 @@ static_library("browsertest_support") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//v8:external_startup_data" ]
|
|
@@ -793,7 +811,7 @@ index 23858defb34c7f40458b5ec6da337b95cdeb347f..08097629fbcd4e30860157523d91d0cf
|
|
|
}
|
|
|
|
|
|
mojom("content_test_mojo_bindings") {
|
|
|
-@@ -1912,6 +1914,7 @@ test("content_browsertests") {
|
|
|
+@@ -1918,6 +1920,7 @@ test("content_browsertests") {
|
|
|
"//ui/shell_dialogs",
|
|
|
"//ui/snapshot",
|
|
|
"//ui/webui:test_support",
|
|
@@ -801,7 +819,7 @@ index 23858defb34c7f40458b5ec6da337b95cdeb347f..08097629fbcd4e30860157523d91d0cf
|
|
|
]
|
|
|
|
|
|
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
|
|
|
-@@ -3196,6 +3199,7 @@ test("content_unittests") {
|
|
|
+@@ -3203,6 +3206,7 @@ test("content_unittests") {
|
|
|
"//ui/latency:test_support",
|
|
|
"//ui/shell_dialogs:shell_dialogs",
|
|
|
"//ui/webui:test_support",
|
|
@@ -822,7 +840,7 @@ index 8779cf7cbbe2a583fda51867eaebc627f00bd4cd..98da1587fdc8cc8358a69db2b51d3982
|
|
|
|
|
|
# TODO(crbug.com/40139469): Blink test plugin must be migrated from PPAPI.
|
|
|
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
|
|
|
-index f2164b5fcc5282820b343df8bde70700374b81be..2a04f4f7f0f9203ebf57c8d1e12d127c8bf35527 100644
|
|
|
+index af32815b302dff9750a1dcd83b6e03df7d5f2dc9..7f20a6affe68057eb51d3176d7a901c85cacf2e0 100644
|
|
|
--- a/device/bluetooth/BUILD.gn
|
|
|
+++ b/device/bluetooth/BUILD.gn
|
|
|
@@ -258,6 +258,7 @@ component("bluetooth") {
|
|
@@ -834,7 +852,7 @@ index f2164b5fcc5282820b343df8bde70700374b81be..2a04f4f7f0f9203ebf57c8d1e12d127c
|
|
|
|
|
|
if (is_mac) {
|
|
|
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
|
|
|
-index fa86583a2d82c4076cfcf64cdc3f6bbb533b95d7..3e4bda0bc31431cb2cc0893d246be6bb54cfab83 100644
|
|
|
+index 6431af67ab634cf23729b9102c189b2181cfd2cf..22040e1bfb96d810a2d8e62e44e4afbc684c8c06 100644
|
|
|
--- a/device/bluetooth/bluetooth_adapter_mac.mm
|
|
|
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
|
|
|
@@ -38,7 +38,9 @@
|
|
@@ -1374,7 +1392,7 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..9921ccb10d3455600eddd85f77f10228
|
|
|
|
|
|
} // namespace sandbox
|
|
|
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
|
|
|
-index af37f79916034980172a94f585ccc9458060c21c..f4838163122b2daf765380d92d2982227688e369 100644
|
|
|
+index 076ae475b3c4f0d2568e5efc9fedf2de7ccc82ad..b961c9c000bbb82c5f6ae63466c6d5d679d92de6 100644
|
|
|
--- a/third_party/blink/renderer/core/BUILD.gn
|
|
|
+++ b/third_party/blink/renderer/core/BUILD.gn
|
|
|
@@ -409,6 +409,7 @@ component("core") {
|
|
@@ -1418,7 +1436,7 @@ index 79501bed8f5853d5dacaaaf08af833b81f3babb7..d3d2759e0b6512ab01d1ef386f43468f
|
|
|
}
|
|
|
|
|
|
diff --git a/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h b/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h
|
|
|
-index b11c365f42dd1ddc363de0d94c387b13ac65bef3..5da42beb20b514396287cc6dc5cba608e1660b2e 100644
|
|
|
+index 4cbd3fc082ead782e64a950dd5314b1de7e550d5..0f4be1fa6b78c2340ebadb57a62cd47f9b10cebf 100644
|
|
|
--- a/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h
|
|
|
+++ b/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h
|
|
|
@@ -7,6 +7,7 @@
|
|
@@ -1439,7 +1457,7 @@ index b11c365f42dd1ddc363de0d94c387b13ac65bef3..5da42beb20b514396287cc6dc5cba608
|
|
|
@class CALayer;
|
|
|
|
|
|
namespace ui {
|
|
|
-@@ -110,7 +113,9 @@ class ACCELERATED_WIDGET_MAC_EXPORT CALayerTreeCoordinator {
|
|
|
+@@ -108,7 +111,9 @@ class ACCELERATED_WIDGET_MAC_EXPORT CALayerTreeCoordinator {
|
|
|
// both the current tree and the pending trees.
|
|
|
size_t presented_ca_layer_trees_max_length_ = 2;
|
|
|
|
|
@@ -1450,7 +1468,7 @@ index b11c365f42dd1ddc363de0d94c387b13ac65bef3..5da42beb20b514396287cc6dc5cba608
|
|
|
// The root CALayer to display the current frame. This does not change
|
|
|
// over the lifetime of the object.
|
|
|
diff --git a/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm b/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm
|
|
|
-index fd4356bd9a81b01de51c59dcd6637be2b2d8b6ee..ffc0b4e8aaa186840905cfc8b9efcd77e31d7617 100644
|
|
|
+index cfb80b21ada7f04ff615b0437403ac1c6c95bb14..34341007de140aba2e6eeb9d8e8de0ea492c2466 100644
|
|
|
--- a/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm
|
|
|
+++ b/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm
|
|
|
@@ -10,6 +10,7 @@
|
|
@@ -1461,15 +1479,15 @@ index fd4356bd9a81b01de51c59dcd6637be2b2d8b6ee..ffc0b4e8aaa186840905cfc8b9efcd77
|
|
|
#include "ui/base/cocoa/animation_utils.h"
|
|
|
#include "ui/base/cocoa/remote_layer_api.h"
|
|
|
#include "ui/gfx/ca_layer_params.h"
|
|
|
-@@ -33,6 +34,7 @@
|
|
|
- new_presentation_feedback_timestamps_(
|
|
|
- new_presentation_feedback_timestamps),
|
|
|
+@@ -30,6 +31,7 @@
|
|
|
+ allow_av_sample_buffer_display_layer_(
|
|
|
+ allow_av_sample_buffer_display_layer),
|
|
|
buffer_presented_callback_(buffer_presented_callback) {
|
|
|
+#if !IS_MAS_BUILD()
|
|
|
if (allow_remote_layers_) {
|
|
|
root_ca_layer_ = [[CALayer alloc] init];
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
|
-@@ -61,6 +63,7 @@
|
|
|
+@@ -58,6 +60,7 @@
|
|
|
#endif
|
|
|
ca_context_.layer = root_ca_layer_;
|
|
|
}
|
|
@@ -1477,7 +1495,7 @@ index fd4356bd9a81b01de51c59dcd6637be2b2d8b6ee..ffc0b4e8aaa186840905cfc8b9efcd77
|
|
|
}
|
|
|
|
|
|
CALayerTreeCoordinator::~CALayerTreeCoordinator() = default;
|
|
|
-@@ -164,9 +167,13 @@
|
|
|
+@@ -161,9 +164,13 @@
|
|
|
TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers", TRACE_EVENT_SCOPE_THREAD,
|
|
|
"GLImpl", static_cast<int>(gl::GetGLImplementation()),
|
|
|
"width", pixel_size_.width());
|
|
@@ -1616,10 +1634,10 @@ index c8171f0527fe5194f0ea73b57c4444d4c630fbc4..c2ac4da580e3e7f749a0a4de1e859af6
|
|
|
// Accessible object
|
|
|
if (AXElementWrapper::IsValidElement(value)) {
|
|
|
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
|
|
-index 90762aa4f4edcb2f965bdb48c72e4d19a0b49ba6..d4c8463a43c6f693f3646fe88aeda653ae389d05 100644
|
|
|
+index 5ca4c8fc961d24985aa4e0459dc2c42003a5346f..2f5880d1d3fbc3aa1461bbe611c33f789a6f4dde 100644
|
|
|
--- a/ui/base/BUILD.gn
|
|
|
+++ b/ui/base/BUILD.gn
|
|
|
-@@ -362,6 +362,13 @@ component("base") {
|
|
|
+@@ -363,6 +363,13 @@ component("base") {
|
|
|
]
|
|
|
}
|
|
|
|
|
@@ -1633,7 +1651,7 @@ index 90762aa4f4edcb2f965bdb48c72e4d19a0b49ba6..d4c8463a43c6f693f3646fe88aeda653
|
|
|
if (is_ios) {
|
|
|
sources += [
|
|
|
"device_form_factor_ios.mm",
|
|
|
-@@ -512,6 +519,12 @@ component("base") {
|
|
|
+@@ -514,6 +521,12 @@ component("base") {
|
|
|
"//url",
|
|
|
]
|
|
|
|
|
@@ -1786,10 +1804,10 @@ index 29ae2da6a8a2c2a612dfb92f7f9c03ca5fa306b1..440c139a32a0c205e77b657d4aab6468
|
|
|
// Query the display's refresh rate.
|
|
|
if (@available(macos 12.0, *)) {
|
|
|
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
|
|
|
-index e912566bc5216474b9bdec4b5bcc8c15fb868346..f333ab59936359e84b361d3ee928a25ae37d59d1 100644
|
|
|
+index 6cf9f1a38ed76edc8f64500476b4b3014dc7677f..54dcf71bd0bf5a1455b31f3d042305f0fc3e345b 100644
|
|
|
--- a/ui/gfx/BUILD.gn
|
|
|
+++ b/ui/gfx/BUILD.gn
|
|
|
-@@ -329,6 +329,12 @@ component("gfx") {
|
|
|
+@@ -331,6 +331,12 @@ component("gfx") {
|
|
|
"//ui/base:ui_data_pack",
|
|
|
]
|
|
|
|
|
@@ -1898,7 +1916,7 @@ index 6a18c94e8c9d531ab3a59faf6027848caed8de57..63aa6b3ba824a3fa71c5a3db94b9ac5e
|
|
|
// Used to force the NSApplication's focused accessibility element to be the
|
|
|
// views::Views accessibility tree when the NSView for this is focused.
|
|
|
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
|
|
|
-index f7ddd05fd9a8165622ff45e182919a0588c53f80..0de4ff37eab3220a59ad1f90bcdd861170691fb5 100644
|
|
|
+index 7e5047fabe59fb2773f13836145cfce64bc1a135..fed3d6a70139443d76ce6181df69bb490c46a081 100644
|
|
|
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
|
|
|
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
|
|
|
@@ -21,6 +21,7 @@
|