|
@@ -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 91eaadbabc64b09917547d3109a32afb3c9c6f9f..8e05de60b7041c8258ba687afce3e1554249c92d 100644
|
|
|
+index 822fa7d9d61f17ef0a94cb0529d239ba98656dd7..d7455c28a5a37434fa6bc7bba7b089d15b603fd1 100644
|
|
|
--- a/base/BUILD.gn
|
|
|
+++ b/base/BUILD.gn
|
|
|
@@ -1048,6 +1048,7 @@ component("base") {
|
|
@@ -73,7 +73,7 @@ index 4bf9a3c27e05c6635b2beb8e880b5b43dbed61b5..57d4756c0d87b9313e8566b3083c0132
|
|
|
|
|
|
} // namespace base
|
|
|
diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
|
|
|
-index 2512b3f43b6ac84dd2a440ac3e68d282c7e429d9..2cb281abf2cc3bd800a2349e41a59454db6da953 100644
|
|
|
+index 87e06c32c70f7c9515c93196260bbd6c6268a59a..6d86d0ce1b3a072889797294b461051e8887f412 100644
|
|
|
--- a/base/process/launch_mac.cc
|
|
|
+++ b/base/process/launch_mac.cc
|
|
|
@@ -21,13 +21,18 @@
|
|
@@ -123,7 +123,7 @@ index 2512b3f43b6ac84dd2a440ac3e68d282c7e429d9..2cb281abf2cc3bd800a2349e41a59454
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-@@ -226,7 +245,7 @@ Process LaunchProcess(const std::vector<std::string>& argv,
|
|
|
+@@ -229,7 +248,7 @@ Process LaunchProcess(const std::vector<std::string>& argv,
|
|
|
file_actions.Inherit(STDERR_FILENO);
|
|
|
}
|
|
|
|
|
@@ -171,7 +171,7 @@ index 4fe7a0bfaa5b3398372f55c6454e738f140efe6b..b1c70281c45aaca4ae483f1f28e9d219
|
|
|
|
|
|
if (is_win) {
|
|
|
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
-index 73a4b456147bd18617ddc9be48b44d1b37d3a2f1..bb0b5a86d24aa5f3d597a6e2e07513f513496741 100644
|
|
|
+index b7a2dede5c5e9a797d10627b7d804064bf13b3f4..d915dccc7dd53ef3eaaae3c50e04342be7c12b38 100644
|
|
|
--- a/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
+++ b/components/remote_cocoa/app_shim/BUILD.gn
|
|
|
@@ -16,6 +16,7 @@ component("app_shim") {
|
|
@@ -183,10 +183,10 @@ index 73a4b456147bd18617ddc9be48b44d1b37d3a2f1..bb0b5a86d24aa5f3d597a6e2e07513f5
|
|
|
"NSToolbar+Private.h",
|
|
|
"NSToolbar+Private.mm",
|
|
|
diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components/remote_cocoa/app_shim/application_bridge.mm
|
|
|
-index c8682418893584aaf61eb6db859b30c99b064698..5d1550030b519f3599dcb855007b25180f0606e9 100644
|
|
|
+index e9f4e5131238b9fb5f1b4b3e90a0cb84a7fc15b4..2202d42e472da0d9bd672e1c12c5d50fc4763c66 100644
|
|
|
--- a/components/remote_cocoa/app_shim/application_bridge.mm
|
|
|
+++ b/components/remote_cocoa/app_shim/application_bridge.mm
|
|
|
-@@ -50,6 +50,7 @@
|
|
|
+@@ -51,6 +51,7 @@
|
|
|
|
|
|
// NativeWidgetNSWindowHostHelper:
|
|
|
id GetNativeViewAccessible() override {
|
|
@@ -194,7 +194,7 @@ index c8682418893584aaf61eb6db859b30c99b064698..5d1550030b519f3599dcb855007b2518
|
|
|
if (!remote_accessibility_element_) {
|
|
|
base::ProcessId browser_pid = base::kNullProcessId;
|
|
|
std::vector<uint8_t> element_token;
|
|
|
-@@ -60,6 +61,9 @@ id GetNativeViewAccessible() override {
|
|
|
+@@ -61,6 +62,9 @@ id GetNativeViewAccessible() override {
|
|
|
ui::RemoteAccessibility::GetRemoteElementFromToken(element_token);
|
|
|
}
|
|
|
return remote_accessibility_element_;
|
|
@@ -204,7 +204,7 @@ index c8682418893584aaf61eb6db859b30c99b064698..5d1550030b519f3599dcb855007b2518
|
|
|
}
|
|
|
void DispatchKeyEvent(ui::KeyEvent* event) override {
|
|
|
bool event_handled = false;
|
|
|
-@@ -98,7 +102,9 @@ void GetWordAt(const gfx::Point& location_in_content,
|
|
|
+@@ -99,7 +103,9 @@ void GetWordAt(const gfx::Point& location_in_content,
|
|
|
mojo::AssociatedRemote<mojom::TextInputHost> text_input_host_remote_;
|
|
|
|
|
|
std::unique_ptr<NativeWidgetNSWindowBridge> bridge_;
|
|
@@ -468,10 +468,10 @@ index 00493dc6c3f0229438b440a6fb2438ca668aba6b..6ce251058868529551cd6f008f840e06
|
|
|
return kAttributes;
|
|
|
}
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
|
-index a991b3662aa6a16fdc362859151a3fbaf755ce85..0c6e7e22ca8cc62687bd863268bfc8256ccae8b9 100644
|
|
|
+index f6f32109e6e12879d7ae3e637fc06ecef3937427..091a8e4cac4fab9a5980f64ec226df0363eff8fb 100644
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
+++ b/content/browser/BUILD.gn
|
|
|
-@@ -71,6 +71,7 @@ source_set("browser") {
|
|
|
+@@ -72,6 +72,7 @@ source_set("browser") {
|
|
|
"//content:content_implementation",
|
|
|
"//v8:external_startup_data",
|
|
|
]
|
|
@@ -709,10 +709,10 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019
|
|
|
|
|
|
} // namespace content
|
|
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
|
|
-index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce57e824550 100644
|
|
|
+index 877e9075f38a66f63a8e049a48798d871055c9a5..62277bb4e69734c89ab06a88124169962a60cbad 100644
|
|
|
--- a/content/test/BUILD.gn
|
|
|
+++ b/content/test/BUILD.gn
|
|
|
-@@ -502,6 +502,7 @@ static_library("test_support") {
|
|
|
+@@ -503,6 +503,7 @@ static_library("test_support") {
|
|
|
configs += [
|
|
|
"//build/config:precompiled_headers",
|
|
|
"//v8:external_startup_data",
|
|
@@ -720,7 +720,7 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5
|
|
|
]
|
|
|
|
|
|
public_deps = [
|
|
|
-@@ -1103,6 +1104,7 @@ static_library("browsertest_support") {
|
|
|
+@@ -1106,6 +1107,7 @@ static_library("browsertest_support") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//v8:external_startup_data" ]
|
|
@@ -728,7 +728,7 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5
|
|
|
}
|
|
|
|
|
|
mojom("content_test_mojo_bindings") {
|
|
|
-@@ -1717,6 +1719,7 @@ test("content_browsertests") {
|
|
|
+@@ -1720,6 +1722,7 @@ test("content_browsertests") {
|
|
|
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
|
|
|
|
|
|
configs += [ "//build/config:precompiled_headers" ]
|
|
@@ -736,7 +736,7 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5
|
|
|
|
|
|
public_deps = [
|
|
|
":test_interfaces",
|
|
|
-@@ -2976,6 +2979,7 @@ test("content_unittests") {
|
|
|
+@@ -2985,6 +2988,7 @@ test("content_unittests") {
|
|
|
}
|
|
|
|
|
|
configs += [ "//build/config:precompiled_headers" ]
|
|
@@ -745,12 +745,12 @@ index f870a3911444701eff4ab0a66ea1bbfa9a157dab..414593f476f6c65ad73ee2262d6dfce5
|
|
|
public_deps = [ "//content:content_resources" ]
|
|
|
|
|
|
diff --git a/content/web_test/BUILD.gn b/content/web_test/BUILD.gn
|
|
|
-index e32afbd72f810a0582656e5c1bd663b232fd1d52..a308f70c622796756a7c73813fd0808f434d79da 100644
|
|
|
+index 99e612f705c5dff041454802033564085718260a..dd2935c6ca926138b9d72e524b7c13b495e5335f 100644
|
|
|
--- a/content/web_test/BUILD.gn
|
|
|
+++ b/content/web_test/BUILD.gn
|
|
|
-@@ -153,6 +153,8 @@ static_library("web_test_browser") {
|
|
|
- "browser/web_test_tts_platform.h",
|
|
|
- ]
|
|
|
+@@ -159,6 +159,8 @@ static_library("web_test_browser") {
|
|
|
+ ]
|
|
|
+ }
|
|
|
|
|
|
+ configs += ["//electron/build/config:mas_build"]
|
|
|
+
|