|
@@ -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 404b12727620ae4cdcfff17e8379764742a90f0e..4b874f02c7525d83bcc0cb475404cf180221f512 100644
|
|
|
+index 5dee8a9226d2422e98878067e35552ca366dc18e..c81c0140dc45e6f436f478cf3b20c73782226f45 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
-@@ -1040,6 +1040,7 @@ component("base") {
|
|
|
+@@ -1017,6 +1017,7 @@ component("base") {
|
|
|
"//build:ios_buildflags",
|
|
|
"//build/config/compiler:compiler_buildflags",
|
|
|
"//third_party/modp_b64",
|
|
@@ -428,7 +428,7 @@ index 4f875587289f19b06041c5e8a7f76ab9cba169c9..952febab99656f59efee8c0d267d8f76
|
|
|
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 5127bd6b8d37e6531fa89a5fc14af4ff9b2615f8..79d7a56fdc87385bd47101cff6334ac85361d3be 100644
|
|
|
+index 97f489043beb4260b1a3ca1781ce7ef67ec8c88a..569859297618cac39aa36655b9e301224ed11f71 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 @@
|
|
@@ -453,10 +453,10 @@ index 5127bd6b8d37e6531fa89a5fc14af4ff9b2615f8..79d7a56fdc87385bd47101cff6334ac8
|
|
|
// 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 4687c5e66f2176cc408b474e4d1e67f7dbf51669..dddf398085d2902b4b1e6e00cb90ccecc238a672 100644
|
|
|
+index 1db2476ae1c2ad9c6d1306531fb9b3a697f3adca..72c960319365abf42ac7279b4d06f3d2b81c6e71 100644
|
|
|
--- a/components/viz/service/BUILD.gn
|
|
|
+++ b/components/viz/service/BUILD.gn
|
|
|
-@@ -378,6 +378,7 @@ viz_component("service") {
|
|
|
+@@ -381,6 +381,7 @@ viz_component("service") {
|
|
|
"frame_sinks/external_begin_frame_source_mac.h",
|
|
|
]
|
|
|
}
|
|
@@ -464,7 +464,7 @@ index 4687c5e66f2176cc408b474e4d1e67f7dbf51669..dddf398085d2902b4b1e6e00cb90ccec
|
|
|
}
|
|
|
|
|
|
if (is_android || use_ozone) {
|
|
|
-@@ -660,6 +661,7 @@ viz_source_set("unit_tests") {
|
|
|
+@@ -663,6 +664,7 @@ viz_source_set("unit_tests") {
|
|
|
"display_embedder/software_output_device_mac_unittest.mm",
|
|
|
]
|
|
|
frameworks = [ "IOSurface.framework" ]
|
|
@@ -558,10 +558,10 @@ index 6aa74c4137ac7a649e8f79eb628e297e9459b089..c89f25bf49d773f5f77b2434bd6fabcf
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index 29a65224b2e218479957762a64eb6f76a46c37e0..b203913917fdc100335dc95bd72914ac49f5a133 100644
|
|
|
+index 6f0eb1326294a246ce737ff8ee3c1be0944a86b3..83d2719e1db8034dc7487cde81c074daa3180a61 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
-@@ -324,6 +324,7 @@ source_set("browser") {
|
|
|
+@@ -325,6 +325,7 @@ source_set("browser") {
|
|
|
"//ui/strings:ax_strings",
|
|
|
"//ui/touch_selection",
|
|
|
"//v8:v8_version",
|
|
@@ -771,7 +771,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index 3df96222754e62ac01366bbf64c9ade4a416673c..f022684e45d6f334366ca335142c94c557ee8778 100644
|
|
|
+index 9fb80e05154c7882f46e00460ee62742a329eb1d..c7ef928f2ea937d41c07aa9382fa64f6bf9625b6 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
@@ -643,6 +643,7 @@ static_library("test_support") {
|
|
@@ -798,7 +798,7 @@ index 3df96222754e62ac01366bbf64c9ade4a416673c..f022684e45d6f334366ca335142c94c5
|
|
|
]
|
|
|
|
|
|
if (!(is_chromeos_ash && target_cpu == "arm64" && current_cpu == "arm")) {
|
|
|
-@@ -3234,6 +3237,7 @@ test("content_unittests") {
|
|
|
+@@ -3236,6 +3239,7 @@ test("content_unittests") {
|
|
|
"//ui/latency:test_support",
|
|
|
"//ui/shell_dialogs:shell_dialogs",
|
|
|
"//ui/webui:test_support",
|
|
@@ -1403,10 +1403,10 @@ index d38e951cdbf1ab9b367273ad0fb8f962155a7f3b..e39ee0414cb54004096dbfffc4f768e8
|
|
|
blink_core_sources_editing += [ "kill_ring_none.cc" ]
|
|
|
}
|
|
|
diff --git a/ui/accelerated_widget_mac/BUILD.gn b/ui/accelerated_widget_mac/BUILD.gn
|
|
|
-index 3ead42e14ad9d41a30c5637678a3ac49296ce2a6..07665bbefd34737bf6a8c3e79d70b066920788c9 100644
|
|
|
+index 79501bed8f5853d5dacaaaf08af833b81f3babb7..d3d2759e0b6512ab01d1ef386f43468fe83408c2 100644
|
|
|
--- a/ui/accelerated_widget_mac/BUILD.gn
|
|
|
+++ b/ui/accelerated_widget_mac/BUILD.gn
|
|
|
-@@ -64,6 +64,7 @@ component("accelerated_widget_mac") {
|
|
|
+@@ -67,6 +67,7 @@ component("accelerated_widget_mac") {
|
|
|
"//ui/gfx",
|
|
|
"//ui/gfx/geometry",
|
|
|
"//ui/gl",
|
|
@@ -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 2fe7bbecaf31c94969e01a317de673ece67c2a27..c93c4831fb000d03014d8569945b5e971abbc77d 100644
|
|
|
+index 12896a91a06e53d623daab137c6a11326659dc2f..180bed4b6900bd6b2ddbe5a3745a28241da8aad6 100644
|
|
|
--- a/ui/base/BUILD.gn
|
|
|
+++ b/ui/base/BUILD.gn
|
|
|
-@@ -355,6 +355,13 @@ component("base") {
|
|
|
+@@ -357,6 +357,13 @@ component("base") {
|
|
|
]
|
|
|
}
|
|
|
|
|
@@ -1628,8 +1628,8 @@ index 2fe7bbecaf31c94969e01a317de673ece67c2a27..c93c4831fb000d03014d8569945b5e97
|
|
|
+
|
|
|
if (is_ios) {
|
|
|
sources += [
|
|
|
- "accelerators/accelerator.cc",
|
|
|
-@@ -502,6 +509,12 @@ component("base") {
|
|
|
+ "device_form_factor_ios.mm",
|
|
|
+@@ -500,6 +507,12 @@ component("base") {
|
|
|
"//url",
|
|
|
]
|
|
|
|
|
@@ -1735,10 +1735,10 @@ index fc25ba79d2b0e1acdb7ba54b89e7d6e16f94771b..de771ef414b9a69e331261524f08e9a1
|
|
|
|
|
|
} // namespace
|
|
|
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
|
|
|
-index 84afacf999c4905fdbaba332e19058a6471c3436..bbab402c8c11e62dad7fa946d9550efa3637dbda 100644
|
|
|
+index fe7a2787f8b5d25a0c11f7ccc3cf00fa9038231a..d62e60c93b9725b625e7f5d0c011c7363d739917 100644
|
|
|
--- a/ui/display/BUILD.gn
|
|
|
+++ b/ui/display/BUILD.gn
|
|
|
-@@ -130,6 +130,12 @@ component("display") {
|
|
|
+@@ -125,6 +125,12 @@ component("display") {
|
|
|
"//ui/gfx/geometry",
|
|
|
]
|
|
|
|
|
@@ -1782,10 +1782,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 762ffff0e4a7ffc40e85dc82f5f0f243a447a85d..db4fbc65fded3beb58e6c336e1d4c4d33d3b2c25 100644
|
|
|
+index 7cd8da2e1a8caf38348d2f56799979a4f1809e7b..d6cbea3a4768ad0e884257fce8db004b1d3b0d72 100644
|
|
|
--- a/ui/gfx/BUILD.gn
|
|
|
+++ b/ui/gfx/BUILD.gn
|
|
|
-@@ -335,6 +335,12 @@ component("gfx") {
|
|
|
+@@ -329,6 +329,12 @@ component("gfx") {
|
|
|
"//ui/base:ui_data_pack",
|
|
|
]
|
|
|
|