mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 115.0.5790.0 (main) (#38418)

Browse source 
* chore: bump chromium in DEPS to 115.0.5789.0

* 4550346: Revert "Convert /chrome/browser to use ARC"

4550346

* chore: update patches

* chore: bump chromium in DEPS to 115.0.5790.0

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot] 2023-05-25 09:54:26 +02:00 • committed by GitHub
parent 294f196907
commit 64045fd058
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 60 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'115.0.5786.0',
'115.0.5790.0',
'node_version':
'v18.16.0',
'nan_version':

1
patches/chromium/.patches
View file

@ -127,4 +127,3 @@ chore_defer_usb_service_getdevices_request_until_usb_service_is.patch
fix_remove_profiles_from_spellcheck_service.patch
chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
chore_patch_out_profile_methods_in_titlebar_config.patch
chore_temporarily_patch_out_arc_references.patch

2
patches/chromium/build_add_electron_tracing_category.patch
View file

@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index dd59416e22822c8754f7446538e1add3e677a81a..b4cbc35fc1e62dffa209a74049eb32aea84090d7 100644
index caf0822f9c14c4be6b9454a1ba006f7bc59086be..8e361bf1796bafbb4682d1bdd4feda98fcc7cbb0 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -80,6 +80,7 @@

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,10 +33,10 @@ index 884bccba58c66861b43b3b50a7535cba543302e2..82e7bf534aa6b998cee8df53be3ca7db
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b50bf319e4343986a9feceeb078c00e7f5b15e0c..a772f8c59aadaccde0367ce614ea341c8de28fbd 100644
index 77d5dfbe1d547f14010d06ab474dd5ad341894c5..76a8c9a33fbede12d3bfeeb3edfbe358ab3a4db2 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4622,7 +4622,7 @@ static_library("browser") {
@@ -4639,7 +4639,7 @@ static_library("browser") {
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
@ -46,10 +46,10 @@ index b50bf319e4343986a9feceeb078c00e7f5b15e0c..a772f8c59aadaccde0367ce614ea341c
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 6e85bb36a93fa3809ea4f6e2768160cd6b7ac3c3..d606468f0f8a4bb92e69cc7ae3cd5b511f2db660 100644
index 44c93857170a46d894eb67aad19337057c29901e..21cb8b14647f17ef5d73180f040064aca9127ba7 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6573,7 +6573,6 @@ test("unit_tests") {
@@ -6583,7 +6583,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index 6e85bb36a93fa3809ea4f6e2768160cd6b7ac3c3..d606468f0f8a4bb92e69cc7ae3cd5b51
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -6599,6 +6598,10 @@ test("unit_tests") {
@@ -6609,6 +6608,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index 6e85bb36a93fa3809ea4f6e2768160cd6b7ac3c3..d606468f0f8a4bb92e69cc7ae3cd5b51
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7546,7 +7549,6 @@ test("unit_tests") {
@@ -7557,7 +7560,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index 6e85bb36a93fa3809ea4f6e2768160cd6b7ac3c3..d606468f0f8a4bb92e69cc7ae3cd5b51
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support",
@@ -7632,6 +7634,10 @@ test("unit_tests") {
@@ -7643,6 +7645,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

2
patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
View file

@ -76,7 +76,7 @@ index 9551e3ea2e5f3de9bff158fc0f443df69a27f93a..e8c192bfbe5a2688e8c767443edbe7fb
if (is_win) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 6c5c6f0771c72ac300e07398d4ed9bd3ce9a6ae3..49b290aef900e270b5d682e0a0d9dcebb9e0414c 100644
index db8e30453c75222e7b2a19fcd950f10fbc413660..e2879b356cbab35ad4cec49364ed1c24a632ff2a 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -56,6 +56,7 @@ source_set("browser") {

8
patches/chromium/chore_add_electron_deps_to_gitignores.patch
View file

@ -18,10 +18,10 @@ index 36fd6c0ff5673343258fd6eee4a79227aa4e52b5..3c2bfca45ff7012d953fc67f9fb01be6
/google_apis/internal
/googleurl
diff --git a/third_party/.gitignore b/third_party/.gitignore
index 242aa829efed37a00046ba2c72a5511855799cd9..8546bcfa6505686f2699f8c9ff63b4b114eb9831 100644
index f7c5eb3e7ebe1272d007a014c7fbae0aadcaf2d1..b888dbdc541407688d20f5d061cc24b97f3dca47 100644
--- a/third_party/.gitignore
+++ b/third_party/.gitignore
@@ -92,6 +92,7 @@
@@ -93,6 +93,7 @@
/directxsdk
/dom_distiller_js/dist
/eigen3/src
@ -29,7 +29,7 @@ index 242aa829efed37a00046ba2c72a5511855799cd9..8546bcfa6505686f2699f8c9ff63b4b1
/elfutils/src
/emoji-metadata/src
/emoji-segmenter/src
@@ -199,6 +200,7 @@
@@ -200,6 +201,7 @@
/mocha
/mockito/src
/nacl_sdk_binaries/
@ -37,7 +37,7 @@ index 242aa829efed37a00046ba2c72a5511855799cd9..8546bcfa6505686f2699f8c9ff63b4b1
/nasm
/nearby/src
/neon_2_sse/src
@@ -266,6 +268,7 @@
@@ -267,6 +269,7 @@
/speex
/sqlite/src
/sqlite4java/lib/

4
patches/chromium/chore_patch_out_profile_methods_in_titlebar_config.patch
View file

@ -6,10 +6,10 @@ Subject: chore: patch out Profile methods in titlebar_config
Make this code linkable in Electron by removing Profile references.
diff --git a/chrome/browser/win/titlebar_config.cc b/chrome/browser/win/titlebar_config.cc
index c270ecf428b85ff95835d8a9f6219d98113743a9..dd55d15add870fa8dfcef0b193a55af679ba6737 100644
index 92d0e8165a264c7ef2701a66e0f7179f0d080f47..b0c91778399f811a5d1b0f208488667cb38459e1 100644
--- a/chrome/browser/win/titlebar_config.cc
+++ b/chrome/browser/win/titlebar_config.cc
@@ -21,8 +21,10 @@ BASE_FEATURE(kWindows11MicaTitlebar,
@@ -19,8 +19,10 @@ BASE_FEATURE(kWindows11MicaTitlebar,
bool ShouldBrowserCustomDrawTitlebar(BrowserView* browser_view) {
return !ShouldDefaultThemeUseMicaTitlebar() ||

8
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -35,10 +35,10 @@ index 155296ba7ee5495be62045bc620bb1cd31d3ceb3..954efde9e7a58f8b556c6ceabb81643f
content::RenderFrameHost* requesting_frame,
const blink::mojom::FullscreenOptions& options) final;
diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
index 034562cbb05f21eec3ddf9c23f4d36182b032218..1273134d7a4c80e8be07fcb41c2318cc53c9c9e0 100644
index 878b5cfde7847990e41e1c5dc2de5c1d39c6c4d7..bc019bfb7540c38204316d46e9f46fe8b90395d4 100644
--- a/chrome/browser/ui/ash/ash_web_view_impl.cc
+++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
@@ -100,10 +100,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
@@ -104,10 +104,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@ -52,10 +52,10 @@ index 034562cbb05f21eec3ddf9c23f4d36182b032218..1273134d7a4c80e8be07fcb41c2318cc
/*from_user_gesture=*/true);
return true;
diff --git a/chrome/browser/ui/ash/ash_web_view_impl.h b/chrome/browser/ui/ash/ash_web_view_impl.h
index 257b34f41d2ae2743704484aa3a7c6e4bf1b8b34..6452a5ee6676827297842e2845614aa2b05f4d81 100644
index 5735c7d58e6d94c6061e49c2862eb052b43cd081..00f95272aef6be1e29eaae45f6a1e0f9a850515f 100644
--- a/chrome/browser/ui/ash/ash_web_view_impl.h
+++ b/chrome/browser/ui/ash/ash_web_view_impl.h
@@ -50,8 +50,7 @@ class AshWebViewImpl : public ash::AshWebView,
@@ -51,8 +51,7 @@ class AshWebViewImpl : public ash::AshWebView,
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,

111
patches/chromium/chore_temporarily_patch_out_arc_references.patch
View file

@ -1,111 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 22 May 2023 13:23:57 +0200
Subject: chore: temporarily patch out ARC references
https://chromium-review.googlesource.com/c/chromium/src/+/4546398
Electron does not support ARC yet.
diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm
index f6acf1369c2ca37687b4f4cd6b3b5763a29c07e7..3443e1597339ebd291517da52c945ae15d1392ce 100644
--- a/chrome/browser/icon_loader_mac.mm
+++ b/chrome/browser/icon_loader_mac.mm
@@ -18,9 +18,9 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_util_mac.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+// #if !defined(__has_feature) || !__has_feature(objc_arc)
+// #error "This file requires ARC support."
+// #endif
// static
IconLoader::IconGroup IconLoader::GroupForFilepath(
diff --git a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
index d9c0ffb9d3a775774545f2b0ddf35f4465a9f641..fbd51a74acfc7fec809fcd19706ae4017f0ece66 100644
--- a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
+++ b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
@@ -22,9 +22,9 @@
#include "media/base/media_switches.h"
#include "ui/base/cocoa/permissions_utils.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+// #if !defined(__has_feature) || !__has_feature(objc_arc)
+// #error "This file requires ARC support."
+// #endif
namespace system_media_permissions {
diff --git a/chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm b/chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
index c8ab96a87f5e5203223bdbbf45f68b1d00226585..2c46f06d1dfd566f7e76b9d7291414c1dcdd06c6 100644
--- a/chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
+++ b/chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
@@ -10,9 +10,9 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+// #if !defined(__has_feature) || !__has_feature(objc_arc)
+// #error "This file requires ARC support."
+// #endif
namespace system_media_permissions {
diff --git a/chrome/browser/media/webrtc/window_icon_util_mac.mm b/chrome/browser/media/webrtc/window_icon_util_mac.mm
index b075efd130f996d01ce8204921832d02c476dfce..3b1933aa037610ca0ab9ebf969c80fea3ac0a5a3 100644
--- a/chrome/browser/media/webrtc/window_icon_util_mac.mm
+++ b/chrome/browser/media/webrtc/window_icon_util_mac.mm
@@ -11,9 +11,9 @@
#include "third_party/libyuv/include/libyuv/convert_argb.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+// #if !defined(__has_feature) || !__has_feature(objc_arc)
+// #error "This file requires ARC support."
+// #endif
gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {
DCHECK(id.type == content::DesktopMediaID::TYPE_WINDOW);
diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm
index 57eac7e0e9a83609701c6d5d9760112f6227b4df..03955f351cc0024cabd0a83f5e243071a95ce0fb 100644
--- a/chrome/browser/platform_util_mac.mm
+++ b/chrome/browser/platform_util_mac.mm
@@ -20,9 +20,9 @@
#include "ui/views/widget/widget.h"
#include "url/gurl.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+// #if !defined(__has_feature) || !__has_feature(objc_arc)
+// #error "This file requires ARC support."
+// #endif
namespace platform_util {
diff --git a/chrome/browser/process_singleton_mac.mm b/chrome/browser/process_singleton_mac.mm
index c92f894bbc99718747bff420e1713198d0f7a2b8..032dfb8823918da92aabf6601e493b8bbf003003 100644
--- a/chrome/browser/process_singleton_mac.mm
+++ b/chrome/browser/process_singleton_mac.mm
@@ -9,9 +9,9 @@
#include "base/mac/scoped_aedesc.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+// #if !defined(__has_feature) || !__has_feature(objc_arc)
+// #error "This file requires ARC support."
+// #endif
namespace {

2
patches/chromium/disable_unload_metrics.patch
View file

@ -24,7 +24,7 @@ This patch temporarily disables the metrics so we can have green CI, and we
should continue seeking for a real fix.
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
index 057902f871fd474bdd029ce4797bc054a803a510..d41b8bbe37445be23690d69119bb7f722d9db5bd 100644
index 0ace292061a3a1c18954eb4c32b6a947ed4a7524..3544ab0312ea7e46c76a20ade2d32db6dc05e815 100644
--- a/content/browser/renderer_host/navigator.cc
+++ b/content/browser/renderer_host/navigator.cc
@@ -1257,6 +1257,7 @@ void Navigator::RecordNavigationMetrics(

8
patches/chromium/expose_setuseragent_on_networkcontext.patch
View file

@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 5b53653eb8448c3904fda67f054dd2ec4bbca338..a89b923bcece48d6eaece3d5ac5c5bfcd7a0427c 100644
index a563b5247f45526a1ecc0aa1b96cc8a209c44e5b..a5285ae7b248066f7d8f38877253127f5f400f15 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1468,6 +1468,13 @@ void NetworkContext::SetNetworkConditions(
@@ -1470,6 +1470,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}
@ -51,7 +51,7 @@ index 5b53653eb8448c3904fda67f054dd2ec4bbca338..a89b923bcece48d6eaece3d5ac5c5bfc
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 87e9c6b2549e0db4a3cd88f6528eeb84327ec183..34d2c1a33983489dc56e18a2a7bbd6717645c7a3 100644
index b4c1f3d3e52cf2ee3bfa7bf08b4f3d1c9d3ceb56..5dc47b4fbc0913aa8b5708df47425a0fc3b56c01 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -315,6 +315,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@ -63,7 +63,7 @@ index 87e9c6b2549e0db4a3cd88f6528eeb84327ec183..34d2c1a33983489dc56e18a2a7bbd671
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CHROMEOS)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 37c6e3954c22eb4f42fdb040206e389f39edf432..88babe5b7e7b389b13c06448d3c7eb9469e332df 100644
index 2818775e83ee8aa6c38958d041cfcaa4f099ac5d..4dd90d2c755233f772e18fd64ea3162734c36e5d 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1142,6 +1142,9 @@ interface NetworkContext {

4
patches/chromium/feat_configure_launch_options_for_service_process.patch
View file

@ -183,7 +183,7 @@ index 01e62d7e8df65efb900e9cd0d34bcd8e0ed3e7da..9af6784707f125046d9a734165fc2b08
host->GetChildProcess()->BindServiceInterface(std::move(receiver));
}
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index c223138472a6d4f64c65e645bb842a6be876e6b4..255ed2faa4b7b9d97800f34d1bd921a8b5925861 100644
index cf3c0c18f582ea232eac24b517299e45a4d2f5f9..2f128d1fd1f7aa5e15adc3259f8275ceec1dd4b5 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -156,11 +156,13 @@ const ChildProcessData& UtilityProcessHost::GetData() {
@ -227,7 +227,7 @@ index c223138472a6d4f64c65e645bb842a6be876e6b4..255ed2faa4b7b9d97800f34d1bd921a8
mojom::ChildProcess* UtilityProcessHost::GetChildProcess() {
return static_cast<ChildProcessHostImpl*>(process_->GetHost())
->child_process();
@@ -441,9 +461,22 @@ bool UtilityProcessHost::StartProcess() {
@@ -442,9 +462,22 @@ bool UtilityProcessHost::StartProcess() {
}
#endif // BUILDFLAG(IS_LINUX)

4
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
View file

@ -527,10 +527,10 @@ index 36673e93a8380d4e6d086fe3029a53fa483ccddb..ad91be73ec89f45c2ce083eaa3a8aba6
// Creating output surface failed. The host can send a new request, possibly
// with a different compositing mode.
diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
index 1aae81c4b1d540fa54e4e8dd5642089369fef14e..6bfc201e9e38dc945875b74a851ce460a68d76f8 100644
index ea2888e6e6ce03dd1918a6183960d5809a15b59c..68c628ecbe2f596c93b6ac0d6b1c68cbb6b0a508 100644
--- a/content/browser/compositor/viz_process_transport_factory.cc
+++ b/content/browser/compositor/viz_process_transport_factory.cc
@@ -402,8 +402,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -401,8 +401,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
root_params->display_private =
display_private.BindNewEndpointAndPassReceiver();

14
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View file

@ -49,7 +49,7 @@ index b4d389b1fd8de80490b3b1d4e8d0bc632a7f9de1..d44c070c5f6ab52fdddf79f514988417
mojo::PendingRemote<mojom::TrustTokenAccessObserver> trust_token_observer;
mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
index 645984438efabd1f4a0813c1c0137d37973b2126..52479f4657bdceab9d93fc1e9efde111e44e7545 100644
index b2d4065fa5d6f7b5c93188a5f88be615b3b8b074..a5dc5654b14b36fae013f19f98ab2ba4d357ba4a 100644
--- a/services/network/public/cpp/url_request_mojom_traits.cc
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
@@ -90,6 +90,7 @@ bool StructTraits<network::mojom::TrustedUrlRequestParamsDataView,
@ -61,7 +61,7 @@ index 645984438efabd1f4a0813c1c0137d37973b2126..52479f4657bdceab9d93fc1e9efde111
mojo::PendingRemote<network::mojom::CookieAccessObserver>>();
out->trust_token_observer = data.TakeTrustTokenObserver<
diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
index f4ad62d0093e3e6c2440b2f9307770ee6ae8ef57..fa57f132b7615d779defda35dd42515edfc77e29 100644
index 088c805bd3e3a5e2deab4c3b261c43a68b31d613..382072b3a1e7f7bef15f21594f1e413b3bf0c71c 100644
--- a/services/network/public/cpp/url_request_mojom_traits.h
+++ b/services/network/public/cpp/url_request_mojom_traits.h
@@ -72,6 +72,10 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
@ -76,7 +76,7 @@ index f4ad62d0093e3e6c2440b2f9307770ee6ae8ef57..fa57f132b7615d779defda35dd42515e
cookie_observer(
const network::ResourceRequest::TrustedParams& trusted_params) {
diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
index 7b684ab387bfe37bf486f1ea5424fb7551383b2d..c2e0727104e83c0dad384794e31ffbd5e1d3136d 100644
index c9a4e165fe497ea1ebb412646a1db646fff7c408..f677601aa019519d9b5898b1ca40771926cc017a 100644
--- a/services/network/public/mojom/url_request.mojom
+++ b/services/network/public/mojom/url_request.mojom
@@ -72,6 +72,9 @@ struct TrustedUrlRequestParams {
@ -112,10 +112,10 @@ index cbaf4911df0aab662fb26fb1ca73b7f638d8790d..f8bf9984f6824458712761301d965ab6
string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 61e5014a219b2077691d826159dbb473aeee62bc..28b51564dec0e39742972f992f9f84337349a207 100644
index 731949489abed49015224f63a3ed3e1f8193204e..563f8193c5c75d96b68d7cf4307ca0ec1527b191 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -642,6 +642,7 @@ URLLoader::URLLoader(
@@ -649,6 +649,7 @@ URLLoader::URLLoader(
has_user_activation_ = request.trusted_params->has_user_activation;
allow_cookies_from_browser_ =
request.trusted_params->allow_cookies_from_browser;
@ -123,7 +123,7 @@ index 61e5014a219b2077691d826159dbb473aeee62bc..28b51564dec0e39742972f992f9f8433
}
// Store any cookies passed from the browser process to later attach them to
@@ -717,7 +718,7 @@ URLLoader::URLLoader(
@@ -724,7 +725,7 @@ URLLoader::URLLoader(
url_request_->SetRequestHeadersCallback(base::BindRepeating(
&URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
@ -132,7 +132,7 @@ index 61e5014a219b2077691d826159dbb473aeee62bc..28b51564dec0e39742972f992f9f8433
url_request_->SetResponseHeadersCallback(base::BindRepeating(
&URLLoader::SetRawResponseHeaders, base::Unretained(this)));
}
@@ -1612,6 +1613,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
@@ -1619,6 +1620,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
}
response_ = BuildResponseHead();

4
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file

@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index ce02660be0a16e84f813260b8482e2de856c4856..81b0730eda5e13760721c5e48db244ab74ffd039 100644
index ad258abf7e17f32975c2b3dc392cddb6be940cb0..6e16daacd56c5ad44e1aaf9de1dc80baa670c5c3 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -7500,10 +7500,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7499,10 +7499,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
if (IsForMhtmlSubframe())
return origin_with_debug_info;

4
patches/chromium/frame_host_manager.patch
View file

@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
Allows embedder to intercept site instances created by chromium.
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index fea976a03235c8212f45c605249e31aa134e69a8..10271c810c11c383750b5d43570b23b71495e3de 100644
index 73b31e233975ff2875ca5d586d5c76f765ea29b4..5805e6657c44eb5a66b513917f44c2cb61ba344e 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -3934,6 +3934,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -3935,6 +3935,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}

6
patches/chromium/gritsettings_resource_ids.patch
View file

@ -6,11 +6,11 @@ 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 c9ebf891962bef2e91bfe51584638f3a8949acf5..e8a75fcc43f13b5ca5e238e73111f0dfd3829ceb 100644
index 99f8fb6dbfd4c9689664f22f6dbfeaec2f15b00a..bb34660e39d90f961a2c26f0ffe241c3789465b8 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1143,6 +1143,11 @@
"includes": [4960],
@@ -1141,6 +1141,11 @@
"includes": [7440],
},
+ "electron/electron_resources.grd": {

2
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
View file

@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index c615f9a19854f3e9c0bc70340835cb2117c41ed0..b8ceb570450d88405999cd566ce2e5469b27f89d 100755
index 91ccd8c94c62c2230aba45a45198f1856ac99762..4c792e5634a8be455cdf399de254efa46d3d07d4 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -306,6 +306,8 @@ def GetDefaultHostOs():

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 479b87b12cae8cc7727b198e0d15b97a569cfc28..5b53653eb8448c3904fda67f054dd2ec4bbca338 100644
index 660df7d04bff949cf8b46d02b9fbd10aa379448d..a563b5247f45526a1ecc0aa1b96cc8a209c44e5b 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -139,6 +139,11 @@
@ -136,7 +136,7 @@ index 479b87b12cae8cc7727b198e0d15b97a569cfc28..5b53653eb8448c3904fda67f054dd2ec
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2265,6 +2370,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2268,6 +2373,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
std::move(cert_verifier));
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
#endif // BUILDFLAG(IS_CHROMEOS)
@ -147,7 +147,7 @@ index 479b87b12cae8cc7727b198e0d15b97a569cfc28..5b53653eb8448c3904fda67f054dd2ec
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index a314820247451f507b92bb8e41891cd2958ae45b..87e9c6b2549e0db4a3cd88f6528eeb84327ec183 100644
index 9fca958e0b36407379b671282d5abe8ffd3b284d..b4c1f3d3e52cf2ee3bfa7bf08b4f3d1c9d3ceb56 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -114,6 +114,7 @@ class URLMatcher;
@ -177,7 +177,7 @@ index a314820247451f507b92bb8e41891cd2958ae45b..87e9c6b2549e0db4a3cd88f6528eeb84
std::unique_ptr<HostResolver> internal_host_resolver_;
// Map values set to non-null only if that HostResolver has its own private
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 0d5fd16e2b3be66b1bdfe09d12a6bef5d3c5cd61..37c6e3954c22eb4f42fdb040206e389f39edf432 100644
index e11f45e366c8f289cf169811af5d38f2d3c781c1..2818775e83ee8aa6c38958d041cfcaa4f099ac5d 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -297,6 +297,17 @@ struct NetworkContextFilePaths {

2
patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
View file

@ -31,7 +31,7 @@ index 112fccec57bdeb25857516c70f984d31bcc3cbeb..fdb578b491dc7cc431319b20eec48313
#if BUILDFLAG(IS_CHROMEOS)
diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
index b98320a87ce8601e28038cc15fd29d442bd57e34..d70fabe9f709ba5af1200db1a953d7ef7b65cffb 100644
index 41950193957680e7410cf40b2650644e33e6c791..c6c7c8dd56e319ea4859a0529c2ef655557e3ebf 100644
--- a/ui/color/ui_color_mixer.cc
+++ b/ui/color/ui_color_mixer.cc
@@ -207,6 +207,17 @@ void AddUiColorMixer(ColorProvider* provider,

4
patches/chromium/printing.patch
View file

@ -847,10 +847,10 @@ index 9376c3f858bea408d07ba09d988eaa300b4f550b..d62e09ca4ace8fe094a6b71c05e4ced1
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 7f8aea52f3aa4e3538125de9faa9215a9bb19af5..6c5c6f0771c72ac300e07398d4ed9bd3ce9a6ae3 100644
index 9ff40fa58c5d3cba0918b96f70eb19b21bdfe776..db8e30453c75222e7b2a19fcd950f10fbc413660 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2881,8 +2881,9 @@ source_set("browser") {
@@ -2887,8 +2887,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]

6
patches/v8/build_gn.patch
View file

@ -9,7 +9,7 @@ necessary for native modules to load.
Also change visibility on mksnapshot in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 337910a6431ca42017ccd15cd23b1f461d6db15d..b136baf5363c0d7a53f758ad4bdf790af2bbd6b5 100644
index a69e7b2edbc028a2241a75a804db2e3cbd424d1d..a2d46b8dffcb157e7c4d11d58253fbd0b5743dc0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -715,7 +715,7 @@ config("internal_config") {
@ -21,7 +21,7 @@ index 337910a6431ca42017ccd15cd23b1f461d6db15d..b136baf5363c0d7a53f758ad4bdf790a
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -6493,7 +6493,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6498,7 +6498,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@ -30,7 +30,7 @@ index 337910a6431ca42017ccd15cd23b1f461d6db15d..b136baf5363c0d7a53f758ad4bdf790a
deps = [
":v8_libbase",
@@ -6505,7 +6505,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6510,7 +6510,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

4
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View file

@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index b136baf5363c0d7a53f758ad4bdf790af2bbd6b5..a6f3f600a87a48d88005cb0910401848b81359a4 100644
index a2d46b8dffcb157e7c4d11d58253fbd0b5743dc0..72fbc5a2abb5502daecc0f8178d58c3e24082215 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -715,6 +715,10 @@ config("internal_config") {
@ -27,7 +27,7 @@ index b136baf5363c0d7a53f758ad4bdf790af2bbd6b5..a6f3f600a87a48d88005cb0910401848
defines += [ "BUILDING_V8_SHARED" ]
}
diff --git a/src/base/macros.h b/src/base/macros.h
index afdf30815e19c909649938f3b43b6fa9617dacf0..138dd0a3adbd7bc4a58083663871eca6d1a29b54 100644
index fc29d5c026e1518ee75ddfca541a084b47b0b3b0..582deaddb3582f75090c8aa016c653f37b3fac1e 100644
--- a/src/base/macros.h
+++ b/src/base/macros.h
@@ -383,13 +383,17 @@ bool is_inbounds(float_t v) {

8
patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
View file

@ -6,10 +6,10 @@ Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
This attribute can only be used in all contexts in Visual Studio 2019
diff --git a/include/v8config.h b/include/v8config.h
index 41e7ac3645293fa181fb98ce74a9535aaa4074b4..890567c25e1a07dcd92bbcc21eade1054cf9d0e1 100644
index c3842d5cee2d994cebab9b78a991726439ab46c7..9d97aca8cbdb8da30e35c26ee9e8ff903e3ce760 100644
--- a/include/v8config.h
+++ b/include/v8config.h
@@ -538,10 +538,13 @@ path. Add it with -I<path> to the command line
@@ -540,10 +540,13 @@ path. Add it with -I<path> to the command line
# define V8_PRESERVE_MOST /* NOT SUPPORTED */
#endif
@ -25,7 +25,7 @@ index 41e7ac3645293fa181fb98ce74a9535aaa4074b4..890567c25e1a07dcd92bbcc21eade105
#else
# define V8_DEPRECATED(message)
#endif
@@ -549,7 +552,11 @@ path. Add it with -I<path> to the command line
@@ -551,7 +554,11 @@ path. Add it with -I<path> to the command line
// A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
#if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
@ -38,7 +38,7 @@ index 41e7ac3645293fa181fb98ce74a9535aaa4074b4..890567c25e1a07dcd92bbcc21eade105
#else
# define V8_DEPRECATE_SOON(message)
#endif
@@ -583,7 +590,7 @@ path. Add it with -I<path> to the command line
@@ -585,7 +592,7 @@ path. Add it with -I<path> to the command line
END_ALLOW_USE_DEPRECATED()