|
@@ -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 543bd2e276dbd3635d5af43963a62fb9f47dbb8e..cc0ab9111775c3b3fe4305d3816c4ad8ef5fd1f7 100644
|
|
|
+index 729153db3e9086d259cc087cf861e1f6e79652c3..133f08419189a5a604f5a8047c92e190fbb28341 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
-@@ -1049,6 +1049,7 @@ component("base") {
|
|
|
+@@ -1045,6 +1045,7 @@ component("base") {
|
|
|
"//build/config/compiler:prevent_unsafe_narrowing",
|
|
|
"//build/config/compiler:wexit_time_destructors",
|
|
|
"//build/config/compiler:wglobal_constructors",
|
|
@@ -159,7 +159,7 @@ index 94a028be3c315edc0056408ab9ab41b6b001a1c1..0d830234edb5621f57e39f4a951d357a
|
|
|
|
|
|
} // namespace base
|
|
|
diff --git a/components/os_crypt/sync/BUILD.gn b/components/os_crypt/sync/BUILD.gn
|
|
|
-index 4fe7a0bfaa5b3398372f55c6454e738f140efe6b..b1c70281c45aaca4ae483f1f28e9d21929d17815 100644
|
|
|
+index 3b81e00e1535ec729a521b83fe2471985d177e5c..b3706a4a0f77f8e5fbae3df97153b9cbed7d01f0 100644
|
|
|
--- a/components/os_crypt/sync/BUILD.gn
|
|
|
+++ b/components/os_crypt/sync/BUILD.gn
|
|
|
@@ -46,6 +46,7 @@ component("os_crypt") {
|
|
@@ -468,7 +468,7 @@ index 00493dc6c3f0229438b440a6fb2438ca668aba6b..6ce251058868529551cd6f008f840e06
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index 4c4d49e93f8ed866ef9f5aab54ae6e30981705bf..a4f104cd00ac1b3100bd464545cc59cc5e0dcdcc 100644
|
|
|
+index a0f17bb4ff8eede75f46bb365aca5cd59a90ebad..023183b173146264a1c0a602a3f8e64c94f5690f 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
@@ -72,6 +72,7 @@ source_set("browser") {
|
|
@@ -480,7 +480,7 @@ index 4c4d49e93f8ed866ef9f5aab54ae6e30981705bf..a4f104cd00ac1b3100bd464545cc59cc
|
|
|
libs = []
|
|
|
frameworks = []
|
|
|
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
-index 66aeabc0852b61777dee72dc819cab7fd59b6563..fc09cd942b60a5eea7e35842f031e3259509095d 100644
|
|
|
+index cde2af9e67566aa010cf94b003f4c36ccd887879..88352a659a7aaac708c4e3b23ac888dd7e2abdd2 100644
|
|
|
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
@@ -20,7 +20,9 @@
|
|
@@ -617,10 +617,10 @@ index 9f7b35dc9d0fd6190f689c3e7aa9e730a27e8e8c..fd3eeb9f52367e0c0fca33b82036290d
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
|
|
|
-index 0738636a7462fd973c12d0e26e298c3b767f0c53..977e90c5dc3d8ff48ba9674c1c7d5eb6b6bab662 100644
|
|
|
+index 9f48c905f4abbb0f2e184299a915232cf6a0f6b0..f2d36e7b59533d7514a61a931341ef612f12b107 100644
|
|
|
--- a/content/common/BUILD.gn
|
|
|
+++ b/content/common/BUILD.gn
|
|
|
-@@ -200,6 +200,7 @@ source_set("common") {
|
|
|
+@@ -198,6 +198,7 @@ source_set("common") {
|
|
|
"//content:content_implementation",
|
|
|
"//build/config:precompiled_headers",
|
|
|
]
|
|
@@ -709,10 +709,10 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index ee318367c26c3562b8b31596a71ff783f2aa74ff..9822b67b5036c9d1d8eb9678ce3354d74d18807b 100644
|
|
|
+index 440fad4a51fa662518a6fff8f5c4c3e0c4fded11..402708f5bf0613b0c175aa94c2f7bc2a38db573d 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
-@@ -503,6 +503,7 @@ static_library("test_support") {
|
|
|
+@@ -504,6 +504,7 @@ static_library("test_support") {
|
|
|
configs += [
|
|
|
"//build/config:precompiled_headers",
|
|
|
"//v8:external_startup_data",
|
|
@@ -720,7 +720,7 @@ index ee318367c26c3562b8b31596a71ff783f2aa74ff..9822b67b5036c9d1d8eb9678ce3354d7
|
|
|
]
|
|
|
|
|
|
public_deps = [
|
|
|
-@@ -1106,6 +1107,7 @@ static_library("browsertest_support") {
|
|
|
+@@ -1107,6 +1108,7 @@ static_library("browsertest_support") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//v8:external_startup_data" ]
|
|
@@ -728,7 +728,7 @@ index ee318367c26c3562b8b31596a71ff783f2aa74ff..9822b67b5036c9d1d8eb9678ce3354d7
|
|
|
}
|
|
|
|
|
|
mojom("content_test_mojo_bindings") {
|
|
|
-@@ -1720,6 +1722,7 @@ test("content_browsertests") {
|
|
|
+@@ -1721,6 +1723,7 @@ test("content_browsertests") {
|
|
|
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
|
|
|
|
|
|
configs += [ "//build/config:precompiled_headers" ]
|
|
@@ -736,7 +736,7 @@ index ee318367c26c3562b8b31596a71ff783f2aa74ff..9822b67b5036c9d1d8eb9678ce3354d7
|
|
|
|
|
|
public_deps = [
|
|
|
":test_interfaces",
|
|
|
-@@ -2986,6 +2989,7 @@ test("content_unittests") {
|
|
|
+@@ -2985,6 +2988,7 @@ test("content_unittests") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//build/config:precompiled_headers" ]
|
|
@@ -770,7 +770,7 @@ index 82d4f2bf563f6bf489b1f257efb249ba4ec9a7f3..2959a166d0acf29d79b2c006e0d0f5ab
|
|
|
|
|
|
if (is_mac) {
|
|
|
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
|
|
|
-index 25f2c71ac4d74f1843b3fa5b16a8833170240431..ee2fa297f5cf555269ebb5d6e413cc337e2b6ee9 100644
|
|
|
+index fa86583a2d82c4076cfcf64cdc3f6bbb533b95d7..71b731e2e25ba876639d169c2242087dcf9ff389 100644
|
|
|
--- a/device/bluetooth/bluetooth_adapter_mac.mm
|
|
|
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
|
|
|
@@ -39,6 +39,7 @@
|
|
@@ -789,7 +789,7 @@ index 25f2c71ac4d74f1843b3fa5b16a8833170240431..ee2fa297f5cf555269ebb5d6e413cc33
|
|
|
|
|
|
// A simple helper class that forwards any Bluetooth device connect notification
|
|
|
// to its wrapped |_adapter|.
|
|
|
-@@ -150,8 +152,10 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
|
|
|
+@@ -161,8 +163,10 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
|
|
|
: controller_state_function_(
|
|
|
base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
|
|
|
base::Unretained(this))),
|
|
@@ -800,7 +800,7 @@ index 25f2c71ac4d74f1843b3fa5b16a8833170240431..ee2fa297f5cf555269ebb5d6e413cc33
|
|
|
device_paired_status_callback_(
|
|
|
base::BindRepeating(&IsDeviceSystemPaired)) {
|
|
|
}
|
|
|
-@@ -307,8 +311,12 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
|
|
|
+@@ -313,8 +317,12 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
|
|
|
}
|
|
|
|
|
|
bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
|
|
@@ -1256,7 +1256,7 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..dc30306f2c5d20503399fc3a8860773a
|
|
|
|
|
|
} // namespace sandbox
|
|
|
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
|
|
|
-index e5ecd99e1f690d2559058aeda76666b321193a07..8c79df3ba29976172f1214c4a65a80d596eada3f 100644
|
|
|
+index 9cb087c578629d872d2a2c12a046471527372c81..2b1aa7a79bcae619c3fe205a64fc1bdae4a4efff 100644
|
|
|
--- a/third_party/blink/renderer/core/BUILD.gn
|
|
|
+++ b/third_party/blink/renderer/core/BUILD.gn
|
|
|
@@ -332,6 +332,7 @@ component("core") {
|
|
@@ -1562,7 +1562,7 @@ index 5255116a8e8f897607e5c5df2875dbaf275ec919..0a28b2832470f3c9d45f70499be29c2b
|
|
|
if (is_win) {
|
|
|
sources += [
|
|
|
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
|
|
|
-index 0ab5fbd2a81d8860c73f29c08896f6755b5ca5fa..9400c6c7698258ff2834c550fb8901b49ced35bd 100644
|
|
|
+index dd1a98234966ba069bb6c7e6ab95f64cae0b0f1f..fa17d4b1974b6844ee11343f652d6896b6f1b1db 100644
|
|
|
--- a/ui/gfx/platform_font_mac.mm
|
|
|
+++ b/ui/gfx/platform_font_mac.mm
|
|
|
@@ -28,9 +28,11 @@
|
|
@@ -1592,7 +1592,7 @@ index 0ab5fbd2a81d8860c73f29c08896f6755b5ca5fa..9400c6c7698258ff2834c550fb8901b4
|
|
|
// enough.
|
|
|
return PlatformFontMac::SystemFontType::kGeneral;
|
|
|
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
|
|
|
-index d9ba2d8c885e0272b5705276b700a62cfa63412b..c659348a120caeca83d434b5f67905022b0fe195 100644
|
|
|
+index fcb49d6e5b2f3a3926bd939f30e0513e984b3b76..6245fa6660d96caae28418c7d9fe700012c430d2 100644
|
|
|
--- a/ui/views/BUILD.gn
|
|
|
+++ b/ui/views/BUILD.gn
|
|
|
@@ -721,6 +721,7 @@ component("views") {
|