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

chore: bump chromium to 119.0.6017.0 (main) (#39922)

Browse source 
* chore: bump chromium in DEPS to 119.0.6017.0

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot] 2023-09-20 11:30:38 +02:00 committed by GitHub
parent 0b0a8a5ef3
commit a39c0ee659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 49 additions and 49 deletions
Show stats 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':
'119.0.6016.0',
'119.0.6017.0',
'node_version':
'v18.17.1',
'nan_version':

4
patches/chromium/add_didinstallconditionalfeatures.patch
View file

@ -67,10 +67,10 @@ index cb4cd28c051c3ac4f97981e44636a6ea7d311c39..8eb2fd06f694c2c390427a0e981960f9
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index fbd5c929b323ee9d943615ed8c890d869345165d..af11f266db8d626dfbba6f16d0a906e643e8c337 100644
index 9f5c5385556daf35410365a235bf651f470afb67..615da4a3fc9b516ba4b833800096ed69e8aa7faa 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -200,6 +200,7 @@ void LocalWindowProxy::Initialize() {
@@ -201,6 +201,7 @@ void LocalWindowProxy::Initialize() {
}
InstallConditionalFeatures();

6
patches/chromium/blink_local_frame.patch
View file

@ -49,10 +49,10 @@ index e0ce2a1bcbef7ece6b320adf820ba49148a66fd7..6aefdcfc226089ab3ae149b75ebdc86b
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index e943c44731d3138077de612f948aeab70beb55a2..38587f2855c7482b33936308dd18d8f362331d55 100644
index 89a5c996ec908a2f70d2c8b873b2efc70513830f..a25361b1673083cb25125b84948daed18ea394b5 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -666,10 +666,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -665,10 +665,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
}
DCHECK(!view_ || !view_->IsAttached());
@ -63,7 +63,7 @@ index e943c44731d3138077de612f948aeab70beb55a2..38587f2855c7482b33936308dd18d8f3
if (!Client())
return false;
@@ -717,6 +713,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -716,6 +712,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
DCHECK(!view_->IsAttached());
Client()->WillBeDetached();

12
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,7 +33,7 @@ index 200379c8f6c933f3877fc4c6b983ca64214b8d9e..d76d319cbd13f94d204fb60f0d8f5645
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 443163d7494d7b0d331e86e4ad99ee3ed5715b46..3de49138f64a572aacd558bb780034b000f9e757 100644
index 49759641e01b49feb8bbc665ebf37e8556db59f4..c7fd679b5ddbe871e139dc3c1dba87bb7d9d6ad1 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4764,7 +4764,7 @@ static_library("browser") {
@ -46,10 +46,10 @@ index 443163d7494d7b0d331e86e4ad99ee3ed5715b46..3de49138f64a572aacd558bb780034b0
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index abe2cbf317bd0138a01d00432155f794d9fad15f..ead6bac66332b474cb59cddf619ec899f20f3b31 100644
index 8369debea5dc924370763316343226c226f80e5f..9c9242aa7dcab843582a4b8c575c380945e5756c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6843,7 +6843,6 @@ test("unit_tests") {
@@ -6848,7 +6848,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index abe2cbf317bd0138a01d00432155f794d9fad15f..ead6bac66332b474cb59cddf619ec899
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -6864,6 +6863,10 @@ test("unit_tests") {
@@ -6869,6 +6868,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index abe2cbf317bd0138a01d00432155f794d9fad15f..ead6bac66332b474cb59cddf619ec899
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7839,7 +7842,6 @@ test("unit_tests") {
@@ -7845,7 +7848,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index abe2cbf317bd0138a01d00432155f794d9fad15f..ead6bac66332b474cb59cddf619ec899
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:app_registry_cache_waiter",
@@ -7925,6 +7927,10 @@ test("unit_tests") {
@@ -7931,6 +7933,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

8
patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
View file

@ -74,7 +74,7 @@ index 5d0bae2eb27d6ed90ac83932630954e4376e62b5..1b6c54a5a859ff95db87c133c423182d
if (is_win) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 6d2732b059e238425de0414f9268ca9288367a02..559f27939149ea856ab0be61a20fe9eeac35bf86 100644
index acce654402833f6a3654935c0ab2e16f61594a01..74b7c0e9c5f6b973d812cde0ecc9e0dc187f69b8 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -59,6 +59,7 @@ source_set("browser") {
@ -110,7 +110,7 @@ index 5ab406dbebe5c159c6e209f8844bf6fabd47199f..224c45b7bff3c4073c70bbd8bdc1fd1c
public_deps = [
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 6b31f7eb59babbb14d90e9278c978523753aba09..48613c5806a1df0e3cb9aff9f491ae775cdbdff2 100644
index f77e497c102deb7abd8719b7637e085855d8314c..61f75d917dabcc843c1a9d25d59f22f9c75a4013 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -484,6 +484,7 @@ static_library("test_support") {
@ -288,7 +288,7 @@ index ebd698116ef4f88c3bbaea1b02912bbeddbca34f..e096f9371607a088250e1ea72f450f85
if (is_win) {
sources += [
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index e5242c9831e514231954282501a1894af2d85288..eac051cd1e4705410fd13f2b63b62659c643b580 100644
index 2a8a84adf7ad37bf1857e4a553c5115eee027c99..c7e3b70b30abaf3cc91a24c406054ae1870d8185 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -684,6 +684,7 @@ component("views") {
@ -299,7 +299,7 @@ index e5242c9831e514231954282501a1894af2d85288..eac051cd1e4705410fd13f2b63b62659
}
if (is_win) {
@@ -1110,6 +1111,8 @@ source_set("test_support") {
@@ -1111,6 +1112,8 @@ source_set("test_support") {
"//testing/gtest",
]

2
patches/chromium/can_create_window.patch
View file

@ -210,7 +210,7 @@ index bef5a989bac50c177f15f52fe87ac3790d553e85..65dcd2e3b51929400c8bfb6a98a4fb59
} // 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 dda7963e25d8f291a7545cc2f90b9e1af01f99f9..6643254a949e43815af59a24b1a3e33f099f7d62 100644
index 22f92d8f173919127cce18b21f5f7a0895f723a1..240d6cce91b64b8bdc1e1842a06fbba2004b3178 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2165,6 +2165,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

2
patches/chromium/chore_add_buildflag_guard_around_new_include.patch
View file

@ -9,7 +9,7 @@ This is an experimental commit; but if it's successful,
This patch should be upstreamed and then removed from electron's code.
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 6140d79bf6aa9cc8600db570aaa38e19ba5a1c35..8018ce4feb119ac9a36483af477fd313c3a12fc8 100644
index 75997cc57809a66844ab2f1b00c0818c09adf368..01b5382704f7c4ad3a6650b9f198b2cd3055485f 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -43,7 +43,6 @@

4
patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
View file

@ -34,10 +34,10 @@ index 2e4bacce52a45b5d9d7829c1f88f82aa0bb1b4bb..f3537e89191bd2c6d9b06c9b741a1680
Widget* GetWidget();
const Widget* GetWidget() const;
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 7a913d4714ae571505111d5fdf8303793bde629b..ec7a05ac5c261c0292684b47db275f7b1ef5daa4 100644
index 58bae1b8b09bb5d235e67b25e700928e833582ed..27471c4ab49a5d8982ab5201141526386fcc1703 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -3253,15 +3253,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3260,15 +3260,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
SetMsgHandled(FALSE);
// We must let Windows handle the caption buttons if it's drawing them, or
// they won't work.

2
patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
View file

@ -7,7 +7,7 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 2c8a95ce169f9c322b545a4426b8bec2964de2e5..02b93bb09564ffacee638ccbd725c56855dbb6ab 100644
index 0bd8a7330bcbedfdfe7f4bd6873a6244a4778d62..3f114945c77452e2998825f795afc7ee450e69d7 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -39,6 +39,7 @@

4
patches/chromium/enable_reset_aspect_ratio.patch
View file

@ -19,10 +19,10 @@ index 53c1d25e3f56daa9d7929089620c9df7971ceda6..d90c652d7c572686bf54c4d282960ea4
excluded_margin);
}
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index a386fb0594530afb6d842551c487fda7ae565085..825ee88f8375d726466d9967393b77065723fabd 100644
index f43aa724b2a8edf89284e4b3b8301fb939a07c97..130f0ee5def53883b07817a7f2ce7b8e7865b5bf 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1154,8 +1154,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
@@ -1156,8 +1156,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
const gfx::Size& excluded_margin) {

10
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 d06fa083c0181d6eab50ffa8bebf8a2ecad82399..e59ece8b742041286b40a6231594619e0240e7a3 100644
index 6887a784db5a2a9df582a2dc26f03af61b5c004c..abbcafb1f9f28577b586f93250c5bd75c2a94d83 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1570,6 +1570,13 @@ void NetworkContext::SetNetworkConditions(
@@ -1571,6 +1571,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}
@ -51,7 +51,7 @@ index d06fa083c0181d6eab50ffa8bebf8a2ecad82399..e59ece8b742041286b40a6231594619e
// 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 d1a159bea0aa45e002e298ff2a1b3832cc6f4b3e..52b5881b5b473a50528f45552fcaa519bc452915 100644
index 9bd43e9e373b74f2f8fcc8f12ab0e0c38927dfcb..0112afaa651e75af56abe5ca51b11d9bb001e51b 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -316,6 +316,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@ -63,7 +63,7 @@ index d1a159bea0aa45e002e298ff2a1b3832cc6f4b3e..52b5881b5b473a50528f45552fcaa519
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 36905befa9afdf1ef654df147381d14cadc2e5c7..1dae26184939c05be17a6e0e822ce2ba2f800633 100644
index b678694478f62fc096bb2f79a1982492a0b9a228..fe994600df0ca42d3a6eb668ed127eb6538001a3 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1233,6 +1233,9 @@ interface NetworkContext {
@ -77,7 +77,7 @@ index 36905befa9afdf1ef654df147381d14cadc2e5c7..1dae26184939c05be17a6e0e822ce2ba
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index 398059776f229e06d9c589d66fc76bf9bc82bc78..ad0bfcd3b2bd1671a872b967abd503e024dbcb48 100644
index 02081b463da906f74a86eed381c5323717d67b7c..7a5c1fd375e0dc5da6bb877d8f4c06905bea9211 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -144,6 +144,7 @@ class TestNetworkContext : public mojom::NetworkContext {

2
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
View file

@ -514,7 +514,7 @@ index 796ae2688436eb07f19909641d1620dd02f10cdb..c9e0eee0b329caf46669b419b1cd10cf
waiting_on_draw_ack_ = true;
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
index 452e5aa346d8603fbb2c4b42f059f966748b801e..abb7e2e3a3d86c4cf51f1b2c8fbb7e183a8bc477 100644
index 479c65c0ecf51d9b8e20e8b39eae4d9e62576b94..3d3634695888ada5569ffb04388e2b9b85c4ccfb 100644
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
@@ -97,7 +97,8 @@ RootCompositorFrameSinkImpl::Create(

2
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View file

@ -112,7 +112,7 @@ index d0df2913c2e5102cfd1e1ff140e6c95d168900bd..830f90a83774e32116757f8a3b959849
string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index c509cb5af0a15979ea8044367e7b19ba61d09179..4ad8c5476cbf00a4246ec524e5d95037b06a7151 100644
index f9b7f1a05699dc8191c8131482993e34b10cc5e8..f981af0e2329815f7ad9cad80530c3deb26213a9 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -623,6 +623,7 @@ URLLoader::URLLoader(

4
patches/chromium/fix_activate_background_material_on_windows.patch
View file

@ -10,10 +10,10 @@ This patch likely can't be upstreamed as-is, as Chromium doesn't have
this use case in mind currently.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 13268bd89c710690eed5296f4b2157e9476f195e..37de479e95d49f4d2b1d8164c9e3f6a7bcd82612 100644
index 715f24b2bb0599e31acdf9e86cdf9d720461e63a..bc2ecc7e5c1c343e60c0ba12c1c17d41a6d5c035 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1094,7 +1094,7 @@ void HWNDMessageHandler::FrameTypeChanged() {
@@ -1096,7 +1096,7 @@ void HWNDMessageHandler::FrameTypeChanged() {
void HWNDMessageHandler::PaintAsActiveChanged() {
if (!delegate_->HasNonClientView() || !delegate_->CanActivate() ||

4
patches/chromium/fix_aspect_ratio_with_max_size.patch
View file

@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
BrowserWindow.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 825ee88f8375d726466d9967393b77065723fabd..7a913d4714ae571505111d5fdf8303793bde629b 100644
index 130f0ee5def53883b07817a7f2ce7b8e7865b5bf..58bae1b8b09bb5d235e67b25e700928e833582ed 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -3805,14 +3805,29 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
@@ -3817,14 +3817,29 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
min_window_size = delegate_->DIPToScreenSize(min_window_size);
max_window_size = delegate_->DIPToScreenSize(max_window_size);

4
patches/chromium/fix_remove_caption-removing_style_call.patch
View file

@ -18,10 +18,10 @@ or resizing, but Electron does not seem to run into that issue
for opaque frameless windows even with that block commented out.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index ec7a05ac5c261c0292684b47db275f7b1ef5daa4..13268bd89c710690eed5296f4b2157e9476f195e 100644
index 27471c4ab49a5d8982ab5201141526386fcc1703..715f24b2bb0599e31acdf9e86cdf9d720461e63a 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1873,7 +1873,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
@@ -1880,7 +1880,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
SendMessage(hwnd(), WM_CHANGEUISTATE, MAKELPARAM(UIS_CLEAR, UISF_HIDEFOCUS),
0);

6
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View file

@ -64,10 +64,10 @@ index 4cd668a127a50e5462e3878c3f1dcb7384926768..dfbec49249404df8f8ebdbd26e6e865c
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 38587f2855c7482b33936308dd18d8f362331d55..464611c3d15b1cf00f02fa0b8da81919e2c142a2 100644
index a25361b1673083cb25125b84948daed18ea394b5..af281ca5ee637d8aa6be39077aab568dd5b4d9ba 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2816,6 +2816,7 @@ void LocalFrame::RequestExecuteScript(
@@ -2815,6 +2815,7 @@ void LocalFrame::RequestExecuteScript(
mojom::blink::EvaluationTiming evaluation_timing,
mojom::blink::LoadEventBlockingOption blocking_option,
WebScriptExecutionCallback callback,
@ -75,7 +75,7 @@ index 38587f2855c7482b33936308dd18d8f362331d55..464611c3d15b1cf00f02fa0b8da81919
BackForwardCacheAware back_forward_cache_aware,
mojom::blink::WantResultOption want_result_option,
mojom::blink::PromiseResultOption promise_behavior) {
@@ -2849,7 +2850,7 @@ void LocalFrame::RequestExecuteScript(
@@ -2848,7 +2849,7 @@ void LocalFrame::RequestExecuteScript(
PausableScriptExecutor::CreateAndRun(
script_state, std::move(script_sources), execute_script_policy,
user_gesture, evaluation_timing, blocking_option, want_result_option,

2
patches/chromium/load_v8_snapshot_in_browser_process.patch
View file

@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot
in the browser process.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 11dcd5eaabaaba0e297ecb992d1290b3adaff1b1..2c8a95ce169f9c322b545a4426b8bec2964de2e5 100644
index 47314a4f02c33f7ba7e03ecf9f1b6bb97598b947..0bd8a7330bcbedfdfe7f4bd6873a6244a4778d62 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -273,11 +273,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {

16
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View file

@ -7,10 +7,10 @@ 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 9726c189bf110368593f879ac4fa93ecbdf8c8c7..d06fa083c0181d6eab50ffa8bebf8a2ecad82399 100644
index 0a5ee4bd20bb54eb00def65134fa8d45c401f052..6887a784db5a2a9df582a2dc26f03af61b5c004c 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -146,6 +146,11 @@
@@ -147,6 +147,11 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/gurl.h"
@ -22,7 +22,7 @@ index 9726c189bf110368593f879ac4fa93ecbdf8c8c7..d06fa083c0181d6eab50ffa8bebf8a2e
#if BUILDFLAG(IS_CT_SUPPORTED)
#include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
#include "components/certificate_transparency/chrome_require_ct_delegate.h"
@@ -438,6 +443,99 @@ bool GetFullDataFilePath(
@@ -439,6 +444,99 @@ bool GetFullDataFilePath(
} // namespace
@ -122,7 +122,7 @@ index 9726c189bf110368593f879ac4fa93ecbdf8c8c7..d06fa083c0181d6eab50ffa8bebf8a2e
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
NetworkContext::NetworkContextHttpAuthPreferences::
@@ -835,6 +933,13 @@ void NetworkContext::SetClient(
@@ -836,6 +934,13 @@ void NetworkContext::SetClient(
client_.Bind(std::move(client));
}
@ -136,7 +136,7 @@ index 9726c189bf110368593f879ac4fa93ecbdf8c8c7..d06fa083c0181d6eab50ffa8bebf8a2e
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2460,6 +2565,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2461,6 +2566,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 9726c189bf110368593f879ac4fa93ecbdf8c8c7..d06fa083c0181d6eab50ffa8bebf8a2e
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index dabaa618a3b427fa4a0f3f9d3963c471dbea124f..d1a159bea0aa45e002e298ff2a1b3832cc6f4b3e 100644
index 3f51ecd9694c900ffb21d7e9ec5d737387ea39ca..9bd43e9e373b74f2f8fcc8f12ab0e0c38927dfcb 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -114,6 +114,7 @@ class URLMatcher;
@ -167,7 +167,7 @@ index dabaa618a3b427fa4a0f3f9d3963c471dbea124f..d1a159bea0aa45e002e298ff2a1b3832
void ResetURLLoaderFactories() override;
void GetViaObliviousHttp(
mojom::ObliviousHttpRequestPtr request,
@@ -897,6 +900,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -899,6 +902,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::vector<base::OnceClosure> dismount_closures_;
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
@ -177,7 +177,7 @@ index dabaa618a3b427fa4a0f3f9d3963c471dbea124f..d1a159bea0aa45e002e298ff2a1b3832
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 db64a42b6570c6c575cec2e67a73ca4b54b486b0..36905befa9afdf1ef654df147381d14cadc2e5c7 100644
index 0af727743712cb82c882c3597e3b75e9f2ef5303..b678694478f62fc096bb2f79a1982492a0b9a228 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -317,6 +317,17 @@ struct NetworkContextFilePaths {

2
patches/chromium/printing.patch
View file

@ -905,7 +905,7 @@ index 45b63865e34e6d8225e11e9b74d864f40dce5f4a..d175ab1e3aa7612467a4eb06464e1d2b
// Calculate number of pages in source document.
uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame,
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 1e070ba3ae0277a82b431aa658709927e52234fc..6d2732b059e238425de0414f9268ca9288367a02 100644
index 4ede4d162014075d014e0a8dcaa783160037859d..acce654402833f6a3654935c0ab2e16f61594a01 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2969,8 +2969,9 @@ source_set("browser") {