|
@@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
|
|
|
system priority.
|
|
|
|
|
|
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
|
|
-index 00bf31f3b8fd7a144281406177f694f3afb42d91..273ebd2260f278c7a7f279d59aea8684a0d5eaeb 100644
|
|
|
+index de197a0826f550f39c2438b5bcd53e7f1d463f1b..71d826841792ba99f1d2afca152332e7ff65ee1a 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
@@ -1040,6 +1040,7 @@ component("base") {
|
|
@@ -198,17 +198,17 @@ index e7a65e97b51d93bff864889813317fb7c6ffc846..bb1fc0c99164ae4bdaaaa78e87c30e88
|
|
|
using crypto::AppleKeychain;
|
|
|
|
|
|
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
-index 1458e7d8edcf2fe17b0ab09b8552bdd817b700f9..f5ebc83573ef3fe7e50910cb8ff1ae33fbb7c35b 100644
|
|
|
+index da8b246916811fbee1e63d0aa95be9fa3ae12bfb..3bcd78507a15bb12ffe71a5f67e756000ca2633a 100644
|
|
|
--- a/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
+++ b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
-@@ -86,6 +86,7 @@ component("app_shim") {
|
|
|
- "//ui/gfx",
|
|
|
- "//ui/gfx/geometry",
|
|
|
- "//ui/strings:ui_strings_grit",
|
|
|
+@@ -75,6 +75,7 @@ component("app_shim") {
|
|
|
+ "//components/crash/core/common",
|
|
|
+ "//components/remote_cocoa/common:mojo",
|
|
|
+ "//components/system_media_controls",
|
|
|
+ "//electron/build/config:generate_mas_config",
|
|
|
- ]
|
|
|
- frameworks = [
|
|
|
- "Cocoa.framework",
|
|
|
+ "//mojo/public/cpp/bindings",
|
|
|
+ "//net",
|
|
|
+ "//ui/accelerated_widget_mac",
|
|
|
diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components/remote_cocoa/app_shim/application_bridge.mm
|
|
|
index e9f4e5131238b9fb5f1b4b3e90a0cb84a7fc15b4..8b5f4cae3123ac5480ad73f0c873fca0d62f7c9f 100644
|
|
|
--- a/components/remote_cocoa/app_shim/application_bridge.mm
|
|
@@ -453,7 +453,7 @@ index f71ea08f64ab5cd36f6bd1e2d3d2908d4de80ba6..4b3450b3bd44a35964bd935453861101
|
|
|
// 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 050ff22c63d6aba75ef1b41e5ffe3869e016a5a7..c72cff69afab53000392220abc7decde1236e178 100644
|
|
|
+index d1a60edcb29d5d2484badf6cb2853871c1e7bcec..964dc5c3aa8440fd3076f2198b2c89e9b8b82816 100644
|
|
|
--- a/components/viz/service/BUILD.gn
|
|
|
+++ b/components/viz/service/BUILD.gn
|
|
|
@@ -376,6 +376,7 @@ viz_component("service") {
|
|
@@ -464,7 +464,7 @@ index 050ff22c63d6aba75ef1b41e5ffe3869e016a5a7..c72cff69afab53000392220abc7decde
|
|
|
}
|
|
|
|
|
|
if (is_android || use_ozone) {
|
|
|
-@@ -650,6 +651,7 @@ viz_source_set("unit_tests") {
|
|
|
+@@ -656,6 +657,7 @@ viz_source_set("unit_tests") {
|
|
|
"display_embedder/software_output_device_mac_unittest.mm",
|
|
|
]
|
|
|
frameworks = [ "IOSurface.framework" ]
|
|
@@ -558,10 +558,10 @@ index 13c3fe06c417a2565e6af4552930a56c44a01fb3..ef67191f5d010451cde2b084d6165c7d
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index 0242fd89a8856c7a122c51fead876c76f637f963..88aab428d5fe1daf747216545e8d176a2be90842 100644
|
|
|
+index cb085a13580106f0218285dc5ad51912d60735d2..f51437492310908f582d3d68cf460c1f8892436c 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
-@@ -320,6 +320,7 @@ source_set("browser") {
|
|
|
+@@ -323,6 +323,7 @@ source_set("browser") {
|
|
|
"//ui/strings:ax_strings",
|
|
|
"//ui/touch_selection",
|
|
|
"//v8:v8_version",
|
|
@@ -604,7 +604,7 @@ index 2285564db47ef15eb9a83affd1e481b5671c3940..cf5e79a5540d8208c34579d7e8b5a571
|
|
|
// 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 5e4a6756da36b544a419319acb1a2ced383fa0bf..a11678b06a83132b91fed2f6728829ec12588acb 100644
|
|
|
+index 34fb29866785ef07c6dca4cfc85966df1c479b5f..e305d25a8f2a34ac90f4d503a9c74dcc6c553cdf 100644
|
|
|
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
|
|
@@ -48,6 +48,7 @@
|
|
@@ -677,10 +677,10 @@ index 5e4a6756da36b544a419319acb1a2ced383fa0bf..a11678b06a83132b91fed2f6728829ec
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
|
|
|
-index ead12a24cc3045ba0a732dac08b6ee4c3b70a521..853162df29df5f5deb87d7d607753831c0a5ebb7 100644
|
|
|
+index 357c5a754f6b3f2992646dda4955aa5b53e0b84f..faf49fec0f54dfb258945e59bc7ee3d15a8a21e7 100644
|
|
|
--- a/content/common/BUILD.gn
|
|
|
+++ b/content/common/BUILD.gn
|
|
|
-@@ -285,6 +285,7 @@ source_set("common") {
|
|
|
+@@ -284,6 +284,7 @@ source_set("common") {
|
|
|
"//ui/shell_dialogs",
|
|
|
"//url",
|
|
|
"//url/ipc:url_ipc",
|
|
@@ -689,10 +689,10 @@ index ead12a24cc3045ba0a732dac08b6ee4c3b70a521..853162df29df5f5deb87d7d607753831
|
|
|
|
|
|
defines = []
|
|
|
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
|
|
|
-index 27ab1bc3f30877a498ce5061babe6005e6d4678c..d6a03a5725d2f1eb7d4d3e4f8ce2b42ff0725a24 100644
|
|
|
+index 55a3baeeec34e9e89b75e93cd17486baef6e550e..cdd5750c7a84e38501e4b6d24e6a2c365b9ce5f1 100644
|
|
|
--- a/content/renderer/BUILD.gn
|
|
|
+++ b/content/renderer/BUILD.gn
|
|
|
-@@ -336,6 +336,7 @@ target(link_target_type, "renderer") {
|
|
|
+@@ -334,6 +334,7 @@ target(link_target_type, "renderer") {
|
|
|
"//ui/surface",
|
|
|
"//url",
|
|
|
"//v8",
|
|
@@ -771,10 +771,10 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index e774b57280006d8e63452fd32d50c387ac298a87..bc41731579964449b678689184bc734724948827 100644
|
|
|
+index f5130062e82601932c346b348cfbbddc218fcca0..8c0998257db56d02ceeab8543cc74fa1018f053b 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
-@@ -639,6 +639,7 @@ static_library("test_support") {
|
|
|
+@@ -640,6 +640,7 @@ static_library("test_support") {
|
|
|
"//url",
|
|
|
"//url/mojom:url_mojom_gurl",
|
|
|
"//v8",
|
|
@@ -782,7 +782,7 @@ index e774b57280006d8e63452fd32d50c387ac298a87..bc41731579964449b678689184bc7347
|
|
|
]
|
|
|
|
|
|
data_deps = [
|
|
|
-@@ -1108,6 +1109,7 @@ static_library("browsertest_support") {
|
|
|
+@@ -1109,6 +1110,7 @@ static_library("browsertest_support") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//v8:external_startup_data" ]
|
|
@@ -1612,10 +1612,10 @@ index c8171f0527fe5194f0ea73b57c4444d4c630fbc4..c2ac4da580e3e7f749a0a4de1e859af6
|
|
|
// Accessible object
|
|
|
if (AXElementWrapper::IsValidElement(value)) {
|
|
|
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
|
|
-index 8ce9bc840e32fde0f058733376e74e1238a69a7f..cdf34bc28085df368e14fe11df28df019370a69d 100644
|
|
|
+index d7541d80aab34a06348359fbcdb41c7d45579b6a..b72f3f34cbe5059940025c2dd89dfa89960436d1 100644
|
|
|
--- a/ui/base/BUILD.gn
|
|
|
+++ b/ui/base/BUILD.gn
|
|
|
-@@ -386,6 +386,13 @@ component("base") {
|
|
|
+@@ -380,6 +380,13 @@ component("base") {
|
|
|
sources += [ "resource/resource_bundle_lacros.cc" ]
|
|
|
}
|
|
|
|
|
@@ -1629,7 +1629,7 @@ index 8ce9bc840e32fde0f058733376e74e1238a69a7f..cdf34bc28085df368e14fe11df28df01
|
|
|
if (is_ios) {
|
|
|
sources += [
|
|
|
"device_form_factor_ios.mm",
|
|
|
-@@ -537,6 +544,12 @@ component("base") {
|
|
|
+@@ -530,6 +537,12 @@ component("base") {
|
|
|
"//url",
|
|
|
]
|
|
|
|
|
@@ -1782,7 +1782,7 @@ 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 3fe00beafd7b6b4bb05c2da94dbb0d7c0076fa87..0b5460349192b7f2b8dc628a81213690f99d8f94 100644
|
|
|
+index 762ffff0e4a7ffc40e85dc82f5f0f243a447a85d..db4fbc65fded3beb58e6c336e1d4c4d33d3b2c25 100644
|
|
|
--- a/ui/gfx/BUILD.gn
|
|
|
+++ b/ui/gfx/BUILD.gn
|
|
|
@@ -335,6 +335,12 @@ component("gfx") {
|
|
@@ -1837,10 +1837,10 @@ index fe3f85073e31de487a08e57d7f9b07aa4eccf8f3..cf5b07203c8bd559a404600cc98cc8ec
|
|
|
// enough.
|
|
|
return PlatformFontMac::SystemFontType::kGeneral;
|
|
|
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
|
|
|
-index ce482dc38f27ac1452df13d8c4152a092fb2a3bc..d4b5fffcf178523ace8db2867ae38d7900c7997d 100644
|
|
|
+index b0032a1d1d23acb43b702295ac7a5e3445610fbe..a1568062e4657f787fb28d04d1ffecc9d77d1376 100644
|
|
|
--- a/ui/views/BUILD.gn
|
|
|
+++ b/ui/views/BUILD.gn
|
|
|
-@@ -722,6 +722,8 @@ component("views") {
|
|
|
+@@ -723,6 +723,8 @@ component("views") {
|
|
|
"IOSurface.framework",
|
|
|
"QuartzCore.framework",
|
|
|
]
|
|
@@ -1849,7 +1849,7 @@ index ce482dc38f27ac1452df13d8c4152a092fb2a3bc..d4b5fffcf178523ace8db2867ae38d79
|
|
|
}
|
|
|
|
|
|
if (is_win) {
|
|
|
-@@ -1155,6 +1157,8 @@ source_set("test_support") {
|
|
|
+@@ -1157,6 +1159,8 @@ source_set("test_support") {
|
|
|
"//ui/base/mojom:ui_base_types",
|
|
|
]
|
|
|
|