github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-19 03:14:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: update patches

Browse Source
This commit is contained in:
Keeley Hammond
2026-01-27 11:20:29 -08:00
parent 6c4e7570be
commit f9baafbebc
19 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/chromium/add_electron_deps_to_license_credits_file.patch
View File

@@ -7,7 +7,7 @@ Ensure that licenses for the dependencies introduced by Electron
are included in `LICENSES.chromium.html`
diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
index 7f22f02d2bc80abdb3be5191d55a1a6d00d1d0a7..8989fde2a7416100f238b0350fb7daf6e3944a70 100755
index f87d1ffc90ba5bd6da87a90c6dd904c01ae42e23..9987b33124cfec689502f991b92c0b05d0433106 100755
--- a/tools/licenses/licenses.py
+++ b/tools/licenses/licenses.py
@@ -355,6 +355,31 @@ SPECIAL_CASES = {

12
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View File

@@ -33,10 +33,10 @@ index f21010994e7e554c63f1bf24d5c09e9904e97bc9..ac151bbddafc76b92af9a7bce56bb405
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 216246a66aa396c74da103306ee63e8d308ca261..38648f53a4f8022a09ba10c2ef7cc317ffbfff7d 100644
index 34290ffd1d83e408f34887705bc1765051b4e049..a5fc97e9d9ec2fcc40453c173019ac9c4a26b012 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4762,7 +4762,7 @@ static_library("browser") {
@@ -4751,7 +4751,7 @@ static_library("browser") {
]
}
@@ -46,10 +46,10 @@ index 216246a66aa396c74da103306ee63e8d308ca261..38648f53a4f8022a09ba10c2ef7cc317
# than here in :chrome_dll.
deps += [ "//chrome:packed_resources_integrity_header" ]
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index bd0f772ce7a0c82f635400f6962103f2626e0387..81326380b74a09b60bcaf063841e6b9921f415c0 100644
index 5f208b17b9910275e8e9c415b7beaba86fa1e6f1..715cf07f0b4aa38a257cbd25ee590b171bb5477c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7669,9 +7669,12 @@ test("unit_tests") {
@@ -7674,9 +7674,12 @@ test("unit_tests") {
"//chrome/notification_helper",
]
@@ -63,7 +63,7 @@ index bd0f772ce7a0c82f635400f6962103f2626e0387..81326380b74a09b60bcaf063841e6b99
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -8636,6 +8639,10 @@ test("unit_tests") {
@@ -8642,6 +8645,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
]
@@ -74,7 +74,7 @@ index bd0f772ce7a0c82f635400f6962103f2626e0387..81326380b74a09b60bcaf063841e6b99
sources += [
# The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc",
@@ -8693,7 +8700,6 @@ test("unit_tests") {
@@ -8699,7 +8706,6 @@ test("unit_tests") {
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
deps += [
"../browser/screen_ai:screen_ai_install_state",

2
patches/chromium/can_create_window.patch
View File

@@ -224,7 +224,7 @@ index d92bab531c12c62a5321a23f4a0cb89691668127..2060e04795ba8e7a923fd0fe3485b8c5
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index de441f87b7591f05347b20da4f682cf9024cd2ed..6ef866cc2b87eed8dbf69bdfafdb53f47972f4e1 100644
index c425735d53a8a79c9ce20c049506659c17b51be3..0c652f899781138cc177460a949280606ebd059f 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2335,6 +2335,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

10
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -80,10 +80,10 @@ index 39fa45f0a0f9076bd7ac0be6f455dd540a276512..3d0381d463eed73470b28085830f2a23
content::WebContents* source,
const content::OpenURLParams& params,
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ee409fe81815c1777d44bc0e3de323f40e3825a4..58b6783f6339e3a163e6f598a217240f788b5c16 100644
index 73bfa0d51d6840704076c51acb86335fde94a196..b76f3754ee0b56649100baf62e8625b6cf1e46da 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2355,7 +2355,8 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -2344,7 +2344,8 @@ bool Browser::IsWebContentsCreationOverridden(
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
const std::string& frame_name,
@@ -93,7 +93,7 @@ index ee409fe81815c1777d44bc0e3de323f40e3825a4..58b6783f6339e3a163e6f598a217240f
if (HasActorTask(profile(), opener)) {
// If an ExecutionEngine is acting on the opener, prevent it from creating a
// new WebContents. We'll instead force the navigation to happen in the same
@@ -2368,7 +2369,7 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -2357,7 +2358,7 @@ bool Browser::IsWebContentsCreationOverridden(
return (window_container_type ==
content::mojom::WindowContainerType::BACKGROUND &&
ShouldCreateBackgroundContents(source_site_instance, opener_url,
@@ -103,10 +103,10 @@ index ee409fe81815c1777d44bc0e3de323f40e3825a4..58b6783f6339e3a163e6f598a217240f
WebContents* Browser::CreateCustomWebContents(
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 3bbf1f6bfcc654ee750862153e37fe2836b4514c..d8859df2113171bf7f2e86dce653e2d258961de3 100644
index ac383addcb49de7af7b515f6ee56f3a577a2520f..ff2724382d1e45a63fc65b45ea9c1331d6514dd5 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -936,8 +936,7 @@ class Browser : public TabStripModelObserver,
@@ -931,8 +931,7 @@ class Browser : public TabStripModelObserver,
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,

6
patches/chromium/expose_setuseragent_on_networkcontext.patch
View File

@@ -33,7 +33,7 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 132b9b3a0a3508fcb25cbca7a3e4164128d2ca3c..bab02e340c36f2f41713740850cde3e3d889f067 100644
index 42c7711ec6b4928b056f6f960f4aa572c58ed548..41c86ec8406a769eb8ea0922eb74e9fa603e3ed8 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1879,6 +1879,13 @@ void NetworkContext::SetNetworkConditions(
@@ -63,10 +63,10 @@ index 36b0d44c840dfd506b56284352e82421594a7f0f..6fc6600d84318a37c9637c8d526da65e
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CT_SUPPORTED)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 160d18eba4101efab2dae444d09947f650079003..b78bde54c454a986ae8b2ed68bf0cf5a3d10568f 100644
index a07b6430f810a4b6ff1e3d527bb20cf675d993d1..769ba60886c6e10e8b4fea333c2f89c1163a783f 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1268,6 +1268,9 @@ interface NetworkContext {
@@ -1276,6 +1276,9 @@ interface NetworkContext {
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
array<MatchedNetworkConditions> conditions);

2
patches/chromium/feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
View File

@@ -46,7 +46,7 @@ index e2771b7b281274cdcb601a5bc78a948ad592087b..48d116823a28213e50775f378e6ce04c
// OnStop is called by StopAndDeAllocate.
virtual void OnStop() = 0;
diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
index d864b712d47452d1941aeae870da91ec2dfc8691..478808f20945ac42dfbd49e160b61d313f401cd1 100644
index 65b86acaaa87c053308444931ee32e34d9cbddfe..24e09d817563ceec7052c8e40bad774a2707c22e 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -28,6 +28,61 @@

8
patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch
View File

@@ -90,10 +90,10 @@ index 0460693f52d6e953d96df4e25a5ab9d005facb98..967c20c931da767c3aa9e2f037b7d756
return a.EmptyCells() == b.EmptyCells();
case CSSPropertyID::kFill:
diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
index bec60c211b0b3314ca6e547987a395a6550a6f49..eedb2e1eca94fa988ffa5f8a1390982e950a55eb 100644
index 405f3f2a81921ac756691f8a837d38d5807e2665..f5e183a42fc496a6c8fe1ba655568a78e6685286 100644
--- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
+++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
@@ -12832,5 +12832,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
@@ -12834,5 +12834,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
CSSValueID::kNone>(stream);
}
@@ -202,7 +202,7 @@ index 19cda703154dab9397827ab6ea66c2ca446c644d..dd5943c511886f4e39b2e7f10e67e60f
return result;
}
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 8998dc0a7f8d815acfd556cc7ab65c9345447072..73454628d80714669157c131b7c12d820e53ba1b 100644
index 17b533ba0503c2ab8b1b7ea5e2e4676301426625..1b9351e34ec26e0cdc4f58344a53a0232d44cc0d 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1670,6 +1670,8 @@ component("platform") {
@@ -313,7 +313,7 @@ index 18f283e625101318ee14b50e6e765dfd1c9a1a44..44a3a55974c9e4b9e715574075f25661
auto DrawAsSinglePath = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 7b45d31dc2048484ad9bd79029c5bf9f20b77dd7..e168512ee13e61f393b6f3f5c300767f59cf77ff 100644
index 18719931844af1444dd769f8cd2d049238508bce..2aa127f5342067f35b5463b8668aa0e110e75757 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -214,6 +214,10 @@

2
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
View File

@@ -90,7 +90,7 @@ index 8af69cac78b7488d28f1f05ccb174793fe5148cd..9f74e511c263d147b5fbe81fe100d217
private:
const HWND hwnd_;
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 123118d66734295f7b00e807aa0437ac76ab3f57..24daad8568b05f35f93f0695f3bcea81d312d379 100644
index 4b69667a75429c367b1e1f98e31cc1ccdb0553d9..3d45ed88a7c07d8447ba947b52789f07cf2d7e84 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -176,6 +176,8 @@ viz_component("service") {

2
patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
View File

@@ -7,7 +7,7 @@ Subject: feat: filter out non-shareable windows in the current application in
This patch ensures that windows protected via win.setContentProtection(true) do not appear in full display captures via desktopCapturer. This patch could be upstreamed but as the check is limited to in-process windows it doesn't make a lot of sense for Chromium itself. This patch currently has a limitation that it only function for windows created / protected BEFORE the stream is started. There is theoretical future work we can do via polling / observers to automatically update the SCContentFilter when new windows are made but for now this will solve 99+% of the problem and folks can re-order their logic a bit to get it working for their use cases.
diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
index 34343b8a8270a25f2528efff70d5ab05d4de3242..d864b712d47452d1941aeae870da91ec2dfc8691 100644
index ab0602e667a10c08c8b82d01624a343dd1a4b7d8..65b86acaaa87c053308444931ee32e34d9cbddfe 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -310,6 +310,31 @@ void OnShareableContentCreated(SCShareableContent* content) {

4
patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
View File

@@ -20,10 +20,10 @@ This patch will be removed when the deprecated sync api support is
removed.
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index b0b648db3a22c2521e572603df1ec080be6b9571..85741a7b89982c3bef4dda77ae43c1779802e64b 100644
index e12a0c8fb17bb00d45a297cf94281dfa2a878c2d..7ba1154f62caeebff56a5bbb4080838fcdf244e0 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -554,7 +554,8 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
@@ -552,7 +552,8 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
return ContentSettingsType::LOCAL_NETWORK;
case PermissionType::LOOPBACK_NETWORK:
return ContentSettingsType::LOOPBACK_NETWORK;

4
patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch
View File

@@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/6936895
as we depend on the removed functionality in this patch.
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 849da439a046aea133946572c79964858e4e7ba5..59200581b6e47a8c6c55d2197cd08ce001efdfcc 100644
index 7f9eab99da6300b89a7118added90f8999428a2c..3bf484c8d86022572ad32bebcb045979672227e2 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
@@ -530,7 +530,7 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -531,7 +531,7 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
is_translucent_window_ = params->is_translucent;
pending_restoration_data_ = params->state_restoration_data;

16
patches/chromium/fix_os_crypt_async_cookie_encryption.patch
View File

@@ -17,10 +17,10 @@ Revert "Reland "Port net::CookieCryptoDelegate to os_crypt async""
This reverts commit f01b115c7e21a09cc762f65bf7fd9c6ea9d9d0f8.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 38648f53a4f8022a09ba10c2ef7cc317ffbfff7d..db9857697733ad7aabc9bd34a1d58fe9939513d5 100644
index a5fc97e9d9ec2fcc40453c173019ac9c4a26b012..e41dc47245ca025cce1f82137f9e607f3e0bdabb 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -731,6 +731,8 @@ static_library("browser") {
@@ -730,6 +730,8 @@ static_library("browser") {
"net/chrome_report_sender.h",
"net/convert_explicitly_allowed_network_ports_pref.cc",
"net/convert_explicitly_allowed_network_ports_pref.h",
@@ -491,7 +491,7 @@ index bb308187837371ecfa2482affaf35ac7ed98c1f3..1e554fe95b0521a883ced83fc67f5d52
sources = [
"os_crypt.h",
diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 3b7ac1e77fb8f1696e6fea46e5e76fd05151b6c0..fa9731f028cf2e2ba7c821e67d3fca95f3e16f36 100644
index 0d07069219883d28af7add90ad4509a94109603f..b732da23aa014aaa3525bbadaec97178d7844e04 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -373,7 +373,6 @@ component("headless_non_renderer") {
@@ -731,10 +731,10 @@ index 91d74eaadd9f4d451e809b38a2f999b298068820..e45427ce90f909e609688ab59f4581b1
mojo::PendingRemote<::network::mojom::NetworkContext> system_context_;
};
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index bab02e340c36f2f41713740850cde3e3d889f067..d0c2ee48c0158de2018a30290c7a04816496335b 100644
index 41c86ec8406a769eb8ea0922eb74e9fa603e3ed8..51562dd5a3720fc9d75b2f5f8c17c198179b0daf 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -3272,12 +3272,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const {
@@ -3274,12 +3274,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const {
crypto_delegate = std::make_unique<CookieOSCryptAsyncDelegate>(
std::move(params_->cookie_encryption_provider));
} else {
@@ -749,7 +749,7 @@ index bab02e340c36f2f41713740850cde3e3d889f067..d0c2ee48c0158de2018a30290c7a0481
}
diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
index b48bdf27cd97142ceebc1f0b769b502bf037ce36..3b1424b6df37aa4a3cd341e8b89524e34480d4ac 100644
index b1c7b1b24feb65a97a0a3e076f8c529e52dcdea8..fbde99e116390833a16dedc543f4dc4d356e4c2e 100644
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -69,8 +69,6 @@ component("cpp") {
@@ -771,10 +771,10 @@ index b48bdf27cd97142ceebc1f0b769b502bf037ce36..3b1424b6df37aa4a3cd341e8b89524e3
"//ipc",
"//net",
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index b78bde54c454a986ae8b2ed68bf0cf5a3d10568f..23c76697cc74f342b8c6786ec62b257ad1c2efd8 100644
index 769ba60886c6e10e8b4fea333c2f89c1163a783f..2911c52f92411ec0962bac40102aea8cde363fc1 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -573,9 +573,10 @@ struct NetworkContextParams {
@@ -575,9 +575,10 @@ struct NetworkContextParams {
bool acam_preflight_spec_conformant = true;
// Sets the cookie encryption provider to be used by this network context if

2
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View File

@@ -211,7 +211,7 @@ index f2c94689450f0333a144ccf82cf147c194896e6b..1c2e9fe36c297f7d614d9ca290e4d13c
const mojom::blink::UserActivationOption user_activation_option_;
const mojom::blink::LoadEventBlockingOption blocking_option_;
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
index 2446e64d96255b968e532e30309d5fb38e3db9b8..40d20fe5dd0e1db3ff1fcfd8301a249d66bce27f 100644
index 518a247f85b2ba2c76a368d5940b15324de04552..c67c0b60c755fd205ecdf97cf0fe9210c067ab29 100644
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
@@ -297,6 +297,7 @@ void ExecuteScriptsInMainWorld(

4
patches/chromium/gritsettings_resource_ids.patch
View File

@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 9340aba3cf1c249a5bebc454e4484121f0fa1ed4..ae42adafc18ada11d0b9829f8f596c24ab2bb574 100644
index 05fe260ac0424f58ff053b81b9d461b11ee71abc..10508c5f2050568673b4e15e8691569a2cce007c 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1632,6 +1632,11 @@
@@ -1636,6 +1636,11 @@
"messages": [10120],
},

22
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
View File

@@ -527,7 +527,7 @@ index 20fbdb2d4ac747aa174c5d8e19fd9f1ea48314a9..7507eb2b9e44fe352861ef74151c3baa
if (self.isHeadless || self.parentWindow) {
// AppKit's default implementation moves child windows down to avoid
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 414874d84338ff12e707d52bc82483957d74d8ef..849da439a046aea133946572c79964858e4e7ba5 100644
index c6cfdc7b778f2027280d8624a0d48f385365f758..7f9eab99da6300b89a7118added90f8999428a2c 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
@@ -42,6 +42,7 @@
@@ -538,7 +538,7 @@ index 414874d84338ff12e707d52bc82483957d74d8ef..849da439a046aea133946572c7996485
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "net/cert/x509_util_apple.h"
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
@@ -731,10 +732,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -732,10 +733,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
// this should be treated as an error and caught early.
CHECK(bridged_view_);
@@ -552,10 +552,10 @@ index 414874d84338ff12e707d52bc82483957d74d8ef..849da439a046aea133946572c7996485
// 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 3c60e4e519f36a098704d744e3659ad0b8083157..123118d66734295f7b00e807aa0437ac76ab3f57 100644
index d787f62c8914bf4dc4287666a273582ff0069f83..4b69667a75429c367b1e1f98e31cc1ccdb0553d9 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -389,6 +389,7 @@ viz_component("service") {
@@ -391,6 +391,7 @@ viz_component("service") {
"frame_sinks/external_begin_frame_source_mojo_mac.h",
]
}
@@ -563,7 +563,7 @@ index 3c60e4e519f36a098704d744e3659ad0b8083157..123118d66734295f7b00e807aa0437ac
}
if (is_ios) {
@@ -714,6 +715,7 @@ viz_source_set("unit_tests") {
@@ -717,6 +718,7 @@ viz_source_set("unit_tests") {
"display_embedder/software_output_device_mac_unittest.mm",
]
frameworks = [ "IOSurface.framework" ]
@@ -872,7 +872,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
} // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 3370c6407201c8577f4dad430558cf4bc2fc633a..dc02c51c0d2a800edf05708d73da2c6ea812668f 100644
index 3d237d2a227d9b90fc734e2290a1d31dbde04aba..a462b05daee8b32de1e504faccbe4bf7f22b8ade 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -702,6 +702,7 @@ static_library("test_support") {
@@ -900,7 +900,7 @@ index 3370c6407201c8577f4dad430558cf4bc2fc633a..dc02c51c0d2a800edf05708d73da2c6e
]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3411,6 +3415,7 @@ test("content_unittests") {
@@ -3412,6 +3416,7 @@ test("content_unittests") {
"//ui/shell_dialogs",
"//ui/webui:test_support",
"//url",
@@ -1782,7 +1782,7 @@ index ef031ba14e4c649f6f3a5718ac521e6b424d64cb..38e528450196b4dbd5fa6a25b96baa10
// Accessible object
if (AXElementWrapper::IsValidElement(value)) {
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index fb8d813511df674326803084a8083da34e754308..a17afdfeb2c5fc29e13d299c41ddb1c9796fe16a 100644
index 7d1c33b93adebfb9d93464399af2df84418d74f4..0b9789fad27bd46acecda88ccf3b13e58c39232c 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -355,6 +355,13 @@ component("base") {
@@ -1903,7 +1903,7 @@ index 93e90c4eba9bc9b93d68e834eb6baabeb2d0ecf0..1b90f41d05f847a94adf2f4da827b1d0
} // namespace
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 8a11735dd897617e374dfd03a9a0521473515b39..193ef1558cb937ad2e28f7cd8ae87e6345f97910 100644
index 1b3ed08902ddb5a4400345c4b0d204ca82df2c5e..6db9f06dbaf357cf83ac7b6ff9acc2f20149d09c 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -138,6 +138,12 @@ component("display") {
@@ -1950,10 +1950,10 @@ index bfffd0444b0711b201cedaddfd3edaa7b5d9220a..8cdae9f250d407d0c2d34ba7c0891b84
// Query the display's refresh rate.
display.set_display_frequency(screen.maximumFramesPerSecond);
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 04e2be450e4499ed08f0b61650e929b2ee46e73a..af4cbcecbbfb2050a390a979543e4ba5bffbdafa 100644
index 8db4f9770541cbd49830fba2770adb03c5db3b2e..7fcbd3fc20a1b116587bf6507cd43ca6f0164b22 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -278,6 +278,8 @@ component("gfx") {
@@ -280,6 +280,8 @@ component("gfx") {
"CoreGraphics.framework",
"CoreText.framework",
]

8
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View File

@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 93cd11cc04697b09fbdd9801e44aef4bfa2d4ae1..132b9b3a0a3508fcb25cbca7a3e4164128d2ca3c 100644
index f2c25d2b38f00eefe975497b7f6bda766f04755a..42c7711ec6b4928b056f6f960f4aa572c58ed548 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -170,6 +170,11 @@
@@ -190,10 +190,10 @@ index 496b8bccd3d84e642e2c59602e9591d3a763ad81..36b0d44c840dfd506b56284352e82421
std::unique_ptr<HostResolver> internal_host_resolver_;
std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 2e1694ccdade6cd5c0ddb849aef3932a856651e2..160d18eba4101efab2dae444d09947f650079003 100644
index ff13d77e072ff2f2efd01fadc4016ede8284d353..a07b6430f810a4b6ff1e3d527bb20cf675d993d1 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -310,6 +310,17 @@ struct SocketBrokerRemotes {
@@ -312,6 +312,17 @@ struct SocketBrokerRemotes {
pending_remote<SocketBroker> server;
};
@@ -211,7 +211,7 @@ index 2e1694ccdade6cd5c0ddb849aef3932a856651e2..160d18eba4101efab2dae444d09947f6
// Parameters for constructing a network context.
struct NetworkContextParams {
// The user agent string.
@@ -954,6 +965,9 @@ interface NetworkContext {
@@ -962,6 +973,9 @@ interface NetworkContext {
// Sets a client for this network context.
SetClient(pending_remote<NetworkContextClient> client);

4
patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch
View File

@@ -6,10 +6,10 @@ Subject: refactor: patch electron PermissionTypes into blink
6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index 85741a7b89982c3bef4dda77ae43c1779802e64b..0850f71f453d34ad16a36ed86f620dea14bbbb33 100644
index 7ba1154f62caeebff56a5bbb4080838fcdf244e0..28e690d9624d9e2e3bf8e712a163f9bf3c2a56bd 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -554,9 +554,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
@@ -552,9 +552,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
return ContentSettingsType::LOCAL_NETWORK;
case PermissionType::LOOPBACK_NETWORK:
return ContentSettingsType::LOOPBACK_NETWORK;

4
patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch
View File

@@ -10,10 +10,10 @@ on Windows. We should refactor our code so that this patch isn't
necessary.
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index f9967b3a0d42721fa286e4f218844e4b8bb9b921..e4ab5e614287d3c4c6b729f73f683948211a64d3 100644
index d7a37fcf1d9523781e3ef012052e07e073661553..883065b20e4bafb46e1a4883a595e4ecf8dcbf62 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -26063,6 +26063,21 @@
@@ -26109,6 +26109,21 @@
]
}
],

4
patches/chromium/scroll_bounce_flag.patch
View File

@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 9228d011f67e543e4c706ea922333436eb5f239a..269a0da72cfa8d06e7ac60155d37e46160fd612c 100644
index 6ff99bd218c33bbaf525827d1ce77d43fb9bcb19..457484c99388e7d66f18b51613e198066be3b3e2 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1130,11 +1130,11 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
@@ -1128,11 +1128,11 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
}
bool RenderThreadImpl::IsElasticOverscrollEnabledOnRoot() {