|
@@ -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 de197a0826f550f39c2438b5bcd53e7f1d463f1b..71d826841792ba99f1d2afca152332e7ff65ee1a 100644
|
|
|
+index 0eb84c31ebbda5e7e842cd0f0df5ff2a15048178..c2fa88ac47c846ad94494660453891b0e38b33e3 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
@@ -1040,6 +1040,7 @@ component("base") {
|
|
@@ -250,7 +250,7 @@ index e9f4e5131238b9fb5f1b4b3e90a0cb84a7fc15b4..8b5f4cae3123ac5480ad73f0c873fca0
|
|
|
|
|
|
} // namespace
|
|
|
diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
|
|
|
-index f9dae777fd2d6ba4f9fe647e6507dea4005d7e25..acef8dfa59981ef58bdfa14108eedfebfdc60334 100644
|
|
|
+index 1db1e7fc1d86bbca432a4226a24a312cf0b989f8..c4192c16299d291df259902ef8497a65776e3189 100644
|
|
|
--- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
|
|
|
+++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
|
|
|
@@ -8,7 +8,9 @@
|
|
@@ -263,7 +263,7 @@ index f9dae777fd2d6ba4f9fe647e6507dea4005d7e25..acef8dfa59981ef58bdfa14108eedfeb
|
|
|
@interface NSWindow (PrivateBrowserNativeWidgetAPI)
|
|
|
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
|
|
|
@end
|
|
|
-@@ -100,10 +102,13 @@ - (void)maybeShowTrafficLights {
|
|
|
+@@ -95,10 +97,13 @@ - (void)maybeShowTrafficLights {
|
|
|
|
|
|
@end
|
|
|
|
|
@@ -277,7 +277,7 @@ index f9dae777fd2d6ba4f9fe647e6507dea4005d7e25..acef8dfa59981ef58bdfa14108eedfeb
|
|
|
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
|
|
|
// - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
|
|
|
if ([BrowserWindowFrame class])
|
|
|
-@@ -150,6 +155,8 @@ - (BOOL)_usesCustomDrawing {
|
|
|
+@@ -145,6 +150,8 @@ - (BOOL)_usesCustomDrawing {
|
|
|
return NO;
|
|
|
}
|
|
|
|
|
@@ -286,7 +286,7 @@ index f9dae777fd2d6ba4f9fe647e6507dea4005d7e25..acef8dfa59981ef58bdfa14108eedfeb
|
|
|
// Handle "Move focus to the window toolbar" configured in System Preferences ->
|
|
|
// Keyboard -> Shortcuts -> Keyboard. Usually Ctrl+F5. The argument (|unknown|)
|
|
|
// tends to just be nil.
|
|
|
-@@ -160,8 +167,8 @@ - (void)_handleFocusToolbarHotKey:(id)unknown {
|
|
|
+@@ -155,8 +162,8 @@ - (void)_handleFocusToolbarHotKey:(id)unknown {
|
|
|
}
|
|
|
|
|
|
- (void)setAlwaysShowTrafficLights:(BOOL)alwaysShow {
|
|
@@ -453,10 +453,10 @@ 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 d1a60edcb29d5d2484badf6cb2853871c1e7bcec..964dc5c3aa8440fd3076f2198b2c89e9b8b82816 100644
|
|
|
+index 4687c5e66f2176cc408b474e4d1e67f7dbf51669..dddf398085d2902b4b1e6e00cb90ccecc238a672 100644
|
|
|
--- a/components/viz/service/BUILD.gn
|
|
|
+++ b/components/viz/service/BUILD.gn
|
|
|
-@@ -376,6 +376,7 @@ viz_component("service") {
|
|
|
+@@ -378,6 +378,7 @@ viz_component("service") {
|
|
|
"frame_sinks/external_begin_frame_source_mac.h",
|
|
|
]
|
|
|
}
|
|
@@ -464,7 +464,7 @@ index d1a60edcb29d5d2484badf6cb2853871c1e7bcec..964dc5c3aa8440fd3076f2198b2c89e9
|
|
|
}
|
|
|
|
|
|
if (is_android || use_ozone) {
|
|
|
-@@ -656,6 +657,7 @@ viz_source_set("unit_tests") {
|
|
|
+@@ -660,6 +661,7 @@ viz_source_set("unit_tests") {
|
|
|
"display_embedder/software_output_device_mac_unittest.mm",
|
|
|
]
|
|
|
frameworks = [ "IOSurface.framework" ]
|
|
@@ -558,7 +558,7 @@ index 13c3fe06c417a2565e6af4552930a56c44a01fb3..ef67191f5d010451cde2b084d6165c7d
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index cb085a13580106f0218285dc5ad51912d60735d2..f51437492310908f582d3d68cf460c1f8892436c 100644
|
|
|
+index 44579cb75f6757ff72279f0e5d8b7115322fa131..5b18a160870a0294a6eda807570ad847be546bf4 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
@@ -323,6 +323,7 @@ source_set("browser") {
|
|
@@ -677,10 +677,10 @@ index 34fb29866785ef07c6dca4cfc85966df1c479b5f..e305d25a8f2a34ac90f4d503a9c74dcc
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
|
|
|
-index 357c5a754f6b3f2992646dda4955aa5b53e0b84f..faf49fec0f54dfb258945e59bc7ee3d15a8a21e7 100644
|
|
|
+index f1a3573055d86e68e7089b06ea1bb3f97e36df27..e5b0194d583e0a0eb2441514abb65816f595dedc 100644
|
|
|
--- a/content/common/BUILD.gn
|
|
|
+++ b/content/common/BUILD.gn
|
|
|
-@@ -284,6 +284,7 @@ source_set("common") {
|
|
|
+@@ -286,6 +286,7 @@ source_set("common") {
|
|
|
"//ui/shell_dialogs",
|
|
|
"//url",
|
|
|
"//url/ipc:url_ipc",
|
|
@@ -771,10 +771,10 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index f5130062e82601932c346b348cfbbddc218fcca0..8c0998257db56d02ceeab8543cc74fa1018f053b 100644
|
|
|
+index e9f8c56f5eaf281f62bf3841c2b000e90c07f4b2..85445aa251d92aff789d4a6d2f3c145e70816c9e 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
-@@ -640,6 +640,7 @@ static_library("test_support") {
|
|
|
+@@ -643,6 +643,7 @@ static_library("test_support") {
|
|
|
"//url",
|
|
|
"//url/mojom:url_mojom_gurl",
|
|
|
"//v8",
|
|
@@ -782,7 +782,7 @@ index f5130062e82601932c346b348cfbbddc218fcca0..8c0998257db56d02ceeab8543cc74fa1
|
|
|
]
|
|
|
|
|
|
data_deps = [
|
|
|
-@@ -1109,6 +1110,7 @@ static_library("browsertest_support") {
|
|
|
+@@ -1112,6 +1113,7 @@ static_library("browsertest_support") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//v8:external_startup_data" ]
|
|
@@ -790,7 +790,7 @@ index f5130062e82601932c346b348cfbbddc218fcca0..8c0998257db56d02ceeab8543cc74fa1
|
|
|
}
|
|
|
|
|
|
mojom("content_test_mojo_bindings") {
|
|
|
-@@ -1931,6 +1933,7 @@ test("content_browsertests") {
|
|
|
+@@ -1936,6 +1938,7 @@ test("content_browsertests") {
|
|
|
"//ui/shell_dialogs",
|
|
|
"//ui/snapshot",
|
|
|
"//ui/webui:test_support",
|
|
@@ -798,7 +798,7 @@ index f5130062e82601932c346b348cfbbddc218fcca0..8c0998257db56d02ceeab8543cc74fa1
|
|
|
]
|
|
|
|
|
|
if (!(is_chromeos_ash && target_cpu == "arm64" && current_cpu == "arm")) {
|
|
|
-@@ -3206,6 +3209,7 @@ test("content_unittests") {
|
|
|
+@@ -3214,6 +3217,7 @@ test("content_unittests") {
|
|
|
"//ui/latency:test_support",
|
|
|
"//ui/shell_dialogs:shell_dialogs",
|
|
|
"//ui/webui:test_support",
|
|
@@ -819,7 +819,7 @@ index 99e612f705c5dff041454802033564085718260a..aa37555d9a9c0fda19d0096d035c245e
|
|
|
|
|
|
# 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 82d4f2bf563f6bf489b1f257efb249ba4ec9a7f3..7ae5132961a01175d0d28004e5fc2e9cfb924bdd 100644
|
|
|
+index 094318e67239ea34ccfe42949f417dece377673a..ba645e2aad56ac007eb6f41cf84cb1e05e4a6a1a 100644
|
|
|
--- a/device/bluetooth/BUILD.gn
|
|
|
+++ b/device/bluetooth/BUILD.gn
|
|
|
@@ -258,6 +258,7 @@ component("bluetooth") {
|
|
@@ -1371,10 +1371,10 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..9921ccb10d3455600eddd85f77f10228
|
|
|
|
|
|
} // namespace sandbox
|
|
|
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
|
|
|
-index c73b33c834353abcf2f209d5a2ee79f76e701e7d..f6a507adee7ff387f131eb14b27ee01e51a20714 100644
|
|
|
+index 2041934dd6c8f5bb77c286871ff79c1fb56922a5..c6b5bb81023dd7b61b8d429e7cb46f4d37c4d9e1 100644
|
|
|
--- a/third_party/blink/renderer/core/BUILD.gn
|
|
|
+++ b/third_party/blink/renderer/core/BUILD.gn
|
|
|
-@@ -404,6 +404,7 @@ component("core") {
|
|
|
+@@ -408,6 +408,7 @@ component("core") {
|
|
|
"//ui/gfx/geometry",
|
|
|
"//ui/gfx/geometry:geometry_skia",
|
|
|
"//ui/strings",
|
|
@@ -1612,11 +1612,11 @@ index c8171f0527fe5194f0ea73b57c4444d4c630fbc4..c2ac4da580e3e7f749a0a4de1e859af6
|
|
|
// Accessible object
|
|
|
if (AXElementWrapper::IsValidElement(value)) {
|
|
|
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
|
|
-index d7541d80aab34a06348359fbcdb41c7d45579b6a..b72f3f34cbe5059940025c2dd89dfa89960436d1 100644
|
|
|
+index d6e2f90269e179f02a5ff972cca6963e86c3e211..c88e9d2f83f427c2763a307a21b81359245086d6 100644
|
|
|
--- a/ui/base/BUILD.gn
|
|
|
+++ b/ui/base/BUILD.gn
|
|
|
-@@ -380,6 +380,13 @@ component("base") {
|
|
|
- sources += [ "resource/resource_bundle_lacros.cc" ]
|
|
|
+@@ -358,6 +358,13 @@ component("base") {
|
|
|
+ ]
|
|
|
}
|
|
|
|
|
|
+ if (is_mas_build) {
|
|
@@ -1629,7 +1629,7 @@ index d7541d80aab34a06348359fbcdb41c7d45579b6a..b72f3f34cbe5059940025c2dd89dfa89
|
|
|
if (is_ios) {
|
|
|
sources += [
|
|
|
"device_form_factor_ios.mm",
|
|
|
-@@ -530,6 +537,12 @@ component("base") {
|
|
|
+@@ -508,6 +515,12 @@ component("base") {
|
|
|
"//url",
|
|
|
]
|
|
|
|
|
@@ -1837,7 +1837,7 @@ index fe3f85073e31de487a08e57d7f9b07aa4eccf8f3..cf5b07203c8bd559a404600cc98cc8ec
|
|
|
// enough.
|
|
|
return PlatformFontMac::SystemFontType::kGeneral;
|
|
|
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
|
|
|
-index b0032a1d1d23acb43b702295ac7a5e3445610fbe..a1568062e4657f787fb28d04d1ffecc9d77d1376 100644
|
|
|
+index 02473f891423617ae9b386d8d8628a4c418ebb2a..8dc033eb0d8cf11cc1d63f050da599454c391b7a 100644
|
|
|
--- a/ui/views/BUILD.gn
|
|
|
+++ b/ui/views/BUILD.gn
|
|
|
@@ -723,6 +723,8 @@ component("views") {
|
|
@@ -1849,7 +1849,7 @@ index b0032a1d1d23acb43b702295ac7a5e3445610fbe..a1568062e4657f787fb28d04d1ffecc9
|
|
|
}
|
|
|
|
|
|
if (is_win) {
|
|
|
-@@ -1157,6 +1159,8 @@ source_set("test_support") {
|
|
|
+@@ -1153,6 +1155,8 @@ source_set("test_support") {
|
|
|
"//ui/base/mojom:ui_base_types",
|
|
|
]
|
|
|
|