github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-06 22:24:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 145.0.7604.0 (main) (#49265)

Browse Source 
* chore: bump chromium in DEPS to 145.0.7599.0

* chore: bump chromium in DEPS to 145.0.7600.0

* chore: bump chromium in DEPS to 145.0.7602.0

* chore: bump chromium in DEPS to 145.0.7604.0

* chore: update patches (trivial only)

* [bytesize] Migrate network data in Task Manager to ByteSize.

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/7266090

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot]
2025-12-28 20:40:50 -08:00
committed by GitHub
parent 809ab09b6f
commit 9eb43f3286
21 changed files with 38 additions and 36 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 = { vars = {
'chromium_version': 'chromium_version':
'145.0.7596.0', '145.0.7604.0',
'node_version': 'node_version':
'v24.11.1', 'v24.11.1',
'nan_version': 'nan_version':

2
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
View File

@@ -116,7 +116,7 @@ index 932658273154ef2e022358e493a8e7c00c86e732..57bbfb5cde62c9496c351c861880a189
// Visibility ----------------------------------------------------------- // Visibility -----------------------------------------------------------
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index 32c9c2773d076e08bd7e4bf9f6b4723de746f79d..26dedfbeb8fa650271fbea7ae46c7e075d29da54 100644 index cfb2b1b36cb0e9bff30c36b44e8f9bf65bb4aa76..555ff8b2392171addb02a2b750ee9c4d00a1e110 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -2498,6 +2498,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( @@ -2498,6 +2498,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(

12
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View File

@@ -33,10 +33,10 @@ index f21010994e7e554c63f1bf24d5c09e9904e97bc9..ac151bbddafc76b92af9a7bce56bb405
"//base", "//base",
"//build:branding_buildflags", "//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d80a3734b8228a2061db6030b087363b2eda5002..091f05f854a6bb95447dbcebe73a2f0c94cbd447 100644 index 56e915175ae3a8fc889d148675b963405f0c88b4..2a53fed2f16f88cfe2de241a87da13521c9cb15a 100644
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4789,7 +4789,7 @@ static_library("browser") { @@ -4785,7 +4785,7 @@ static_library("browser") {
] ]
} }
@@ -46,10 +46,10 @@ index d80a3734b8228a2061db6030b087363b2eda5002..091f05f854a6bb95447dbcebe73a2f0c
# than here in :chrome_dll. # than here in :chrome_dll.
deps += [ "//chrome:packed_resources_integrity_header" ] deps += [ "//chrome:packed_resources_integrity_header" ]
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index cd781b3eccd808d43f78c15540ae479935990a2c..c87e2b47e59896ecb7cbaa6785b75e4fb7cfd20c 100644 index 7d734817213628e3f8a35d1e36a2e939e43b8043..23d770b6f518fd142e07ccfb271d3c5cb9c8fffa 100644
--- a/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -7613,9 +7613,12 @@ test("unit_tests") { @@ -7609,9 +7609,12 @@ test("unit_tests") {
"//chrome/notification_helper", "//chrome/notification_helper",
] ]
@@ -63,7 +63,7 @@ index cd781b3eccd808d43f78c15540ae479935990a2c..c87e2b47e59896ecb7cbaa6785b75e4f
"//chrome//services/util_win:unit_tests", "//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources", "//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests", "//chrome/app:win_unit_tests",
@@ -8573,6 +8576,10 @@ test("unit_tests") { @@ -8569,6 +8572,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
] ]
@@ -74,7 +74,7 @@ index cd781b3eccd808d43f78c15540ae479935990a2c..c87e2b47e59896ecb7cbaa6785b75e4f
sources += [ sources += [
# The importer code is not used on Android. # The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc", "../common/importer/firefox_importer_utils_unittest.cc",
@@ -8629,7 +8636,6 @@ test("unit_tests") { @@ -8625,7 +8632,6 @@ test("unit_tests") {
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
deps += [ deps += [
"../browser/screen_ai:screen_ai_install_state", "../browser/screen_ai:screen_ai_install_state",

10
patches/chromium/can_create_window.patch
View File

@@ -21,7 +21,7 @@ index 3f44db5753e730e6e512b741b51c6c1547541c7e..a13d9066d671b7c87e909434cdc81d88
&no_javascript_access); &no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 70aefbc761baf4a1a48ddab2516b4127f05db067..0f228d360f4ef941ff64b18c06f3cd4f61da5d42 100644 index 6a0200b0d4956131694b5da104033017c3877063..fcd2a6d1663326f5f94ba4758e82c44e7284c58a 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5349,6 +5349,10 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -5349,6 +5349,10 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -77,7 +77,7 @@ index 4c55f0abf8df5a3408f3f90d444ceff3c23ee1bc..72bdb5b5a4c2c21a7192b34bb293bd23
// Operation result when the renderer asks the browser to create a new window. // Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 0aa4795b6027a95556740ca89da4ce6770a4ee08..f604e9f59ee500807b70059f40af937cca675236 100644 index e6bd8b311611556904cb29b089569cff24d75282..250ee1e7416ba51b054dcd9676cefd6da8f09324 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -872,6 +872,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -872,6 +872,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -90,10 +90,10 @@ index 0aa4795b6027a95556740ca89da4ce6770a4ee08..f604e9f59ee500807b70059f40af937c
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access) { bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 25842bf934375d2c4ecd3751d397a5bf7a0cb8fb..67b7389884b43a5949059c541ec0b439edce5a60 100644 index 87455ddef07e28b40d6b8812ff44427167063339..d5fdf66cad6188bc57951a8c72c265cf91feb8a0 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -203,6 +203,7 @@ class NetworkService; @@ -204,6 +204,7 @@ class NetworkService;
class TrustedURLLoaderHeaderClient; class TrustedURLLoaderHeaderClient;
} // namespace mojom } // namespace mojom
struct ResourceRequest; struct ResourceRequest;
@@ -101,7 +101,7 @@ index 25842bf934375d2c4ecd3751d397a5bf7a0cb8fb..67b7389884b43a5949059c541ec0b439
} // namespace network } // namespace network
namespace sandbox { namespace sandbox {
@@ -1448,6 +1449,8 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -1449,6 +1450,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features, const blink::mojom::WindowFeatures& features,

2
patches/chromium/chore_partial_revert_of.patch
View File

@@ -14,7 +14,7 @@ track down the source of this problem & figure out if we can fix it
by changing something in Electron. by changing something in Electron.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 93e25d6d40337390553c3ae4248ce41a6c99bf60..a0c53a319e3cb84d1284142efb170772f1505118 100644 index c483ebfccde1d58f5d5686a453008810fea5abc2..2780e572afefa8faf3ce898b87f0fef321eaf4de 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5320,7 +5320,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -5320,7 +5320,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

2
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -223,7 +223,7 @@ index b969f1d97b7e3396119b579cfbe61e19ff7d2dd4..b8d6169652da28266a514938b45b39c5
content::WebContents* AddNewContents( content::WebContents* AddNewContents(
content::WebContents* source, content::WebContents* source,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 34945729a2383f266aedb031dcefb48673595335..9de7bb38b5a9cb80dd31e6be6748a54c440ed075 100644 index e5e9a1a747f91cb8cdce5b2810713365b321bc9c..cee8f84216beb24f3fe38e8e33d310d839d1b2b8 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5285,8 +5285,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -5285,8 +5285,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

2
patches/chromium/extend_apply_webpreferences.patch
View File

@@ -15,7 +15,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work. done in future work.
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index 26dedfbeb8fa650271fbea7ae46c7e075d29da54..acf990e07b97dc8a0ac1a38b5edccba8aab4cc0e 100644 index 555ff8b2392171addb02a2b750ee9c4d00a1e110..a511d3c2308f3d9c4b571c0e5c8a8fe0c6eb8d95 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -1886,6 +1886,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, @@ -1886,6 +1886,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,

6
patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch
View File

@@ -202,10 +202,10 @@ index 19cda703154dab9397827ab6ea66c2ca446c644d..dd5943c511886f4e39b2e7f10e67e60f
return result; return result;
} }
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 7bcec7aaf69ce271cd74f050c6e2990d2475ad12..49e5bfb8f6e9f7a3651c370152aceca9ed4728d9 100644 index 50c13b5cfbaa137e6440e880ed97401bae4b1abd..6ade5129ce7b6f67d291877201f5344936fb64b1 100644
--- a/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1671,6 +1671,8 @@ component("platform") { @@ -1668,6 +1668,8 @@ component("platform") {
"widget/widget_base.h", "widget/widget_base.h",
"widget/widget_base_client.h", "widget/widget_base_client.h",
"windows_keyboard_codes.h", "windows_keyboard_codes.h",
@@ -313,7 +313,7 @@ index 18f283e625101318ee14b50e6e765dfd1c9a1a44..44a3a55974c9e4b9e715574075f25661
auto DrawAsSinglePath = [&]() { auto DrawAsSinglePath = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 229941e9f8363ff2baa015bb8d346e24524f09de..e6b08825c5917b7d35ebc6001a83be21e33b2e8c 100644 index 70181be69c795bc8d49f0ffeee8b8099c20c9013..fb717b6e0dbd52e7441cc41eb479d7d67aeeb3bd 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -214,6 +214,10 @@ @@ -214,6 +214,10 @@

2
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View File

@@ -112,7 +112,7 @@ index 13a211107294e856616d1626fa1dc9c79eb5646c..549a36886d665c1a8100f09b7a86c8dc
string mime_type; string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 6cefe56ec8304bec35e0c0150fc74b3034ae8438..b10ec130a5e28812915ba23e53dd72c7da4c45b2 100644 index 7f2a3a6e9157a092880e844c49fde63916a17840..a87dbe3032a21984f3f19bde60bcce8f014c0098 100644
--- a/services/network/url_loader.cc --- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc +++ b/services/network/url_loader.cc
@@ -387,6 +387,9 @@ URLLoader::URLLoader( @@ -387,6 +387,9 @@ URLLoader::URLLoader(

2
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
View File

@@ -87,7 +87,7 @@ index 75df43e3cd2721a92c90c18154d53d5c203e2465..ce42c75c8face36d21f53f44c0201ac4
// The view with active text input state, i.e., a focused <input> element. // The view with active text input state, i.e., a focused <input> element.
// It will be nullptr if no such view exists. Note that the active view // It will be nullptr if no such view exists. Note that the active view
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d3e8e7877bfcfffd2e46c0438a244bf12af2dc67..93e25d6d40337390553c3ae4248ce41a6c99bf60 100644 index 926c48f5d6ea2201a7a18a6e5e013584c06c4b66..c483ebfccde1d58f5d5686a453008810fea5abc2 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -10197,7 +10197,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( @@ -10197,7 +10197,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(

4
patches/chromium/frame_host_manager.patch
View File

@@ -20,10 +20,10 @@ index a51feeba896849bb5330fa8119da580c06efe2ef..530e55176859c30dfabd047e2a4e6b25
} }
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 67b7389884b43a5949059c541ec0b439edce5a60..8147c4a5ab00819f38b66b897537ff22525f5e3e 100644 index d5fdf66cad6188bc57951a8c72c265cf91feb8a0..1a7c82ca967ae6ef132f8d556ad5a504dbacaa33 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -341,6 +341,11 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -342,6 +342,11 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ~ContentBrowserClient() = default; virtual ~ContentBrowserClient() = default;

2
patches/chromium/gritsettings_resource_ids.patch
View File

@@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation. 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 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 1c1bd18616f12a25fc140fd0180462955d2c9f48..4956a7dadeb9148f56ef4a5d60ce6c89d1ba83c0 100644 index 2dc6b7b9f6322788b33a53fec427bcf2cd308204..3f3096a81b1d4197094561b81c3006480b34f63f 100644
--- a/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec
@@ -1629,6 +1629,11 @@ @@ -1629,6 +1629,11 @@

2
patches/chromium/printing.patch
View File

@@ -666,7 +666,7 @@ index ac2f719be566020d9f41364560c12e6d6d0fe3d8..16d758a6936f66148a196761cfb875f6
PrintingFailed(int32 cookie, PrintFailureReason reason); PrintingFailed(int32 cookie, PrintFailureReason reason);
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 31dfa8c3c28b9eb184b6e84f4b10c57efec0765e..5990bda676df813dd318d9119a70aec0d8bb1832 100644 index 6be0daa9a4f710270c9e11e2b5edd4027c779e0d..536ea348aa9f7407f9941aa0f15ff860ea202577 100644
--- a/components/printing/renderer/print_render_frame_helper.cc --- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@

2
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -44,7 +44,7 @@ index f95e324953c68df7da916043c56063d0dfb1b914..c560ba92d785e95a6105c36464500596
void RenderWidgetHostImpl::ShowContextMenuAtPoint( void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0f228d360f4ef941ff64b18c06f3cd4f61da5d42..34945729a2383f266aedb031dcefb48673595335 100644 index fcd2a6d1663326f5f94ba4758e82c44e7284c58a..e5e9a1a747f91cb8cdce5b2810713365b321bc9c 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -6158,6 +6158,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -6158,6 +6158,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {

2
patches/chromium/refactor_unfilter_unresponsive_events.patch
View File

@@ -15,7 +15,7 @@ This CL removes these filters so the unresponsive event can still be
accessed from our JS event. The filtering is moved into Electron's code. accessed from our JS event. The filtering is moved into Electron's code.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a0c53a319e3cb84d1284142efb170772f1505118..30f6ecdeb1c85ea9f7e5345a52fe9fe89ea9d03e 100644 index 2780e572afefa8faf3ce898b87f0fef321eaf4de..7df101ba14269b739aa1e47a5893a533a62bf8f0 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -10345,25 +10345,13 @@ void WebContentsImpl::RendererUnresponsive( @@ -10345,25 +10345,13 @@ void WebContentsImpl::RendererUnresponsive(

2
patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch
View File

@@ -54,7 +54,7 @@ index fa909df2ac167b8d2553ff56e5a3305027b520e6..39af86f78724d648667d8d1abc4e8cd3
if (mouse_event_callback.Run(mouse_event)) { if (mouse_event_callback.Run(mouse_event)) {
return; return;
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 30f6ecdeb1c85ea9f7e5345a52fe9fe89ea9d03e..f9dd6aa73ab4a36cecbb4fc374b9471af3fa822f 100644 index 7df101ba14269b739aa1e47a5893a533a62bf8f0..7029d702e25f2806d0fd1f69793d45b433809e28 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4476,6 +4476,12 @@ void WebContentsImpl::RenderWidgetWasResized( @@ -4476,6 +4476,12 @@ void WebContentsImpl::RenderWidgetWasResized(

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. necessary.
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index c60f7cddb98345b6e186a074b0fb290e610ad95c..fdb470bf6b335704c0dea15074ba6aa8967b15eb 100644 index c083d896eea0ee1c69acb7ffa74bea0693dc447b..83d3263a56e7750208b02bfe60f1b7f2e12691e1 100644
--- a/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -25732,6 +25732,21 @@ @@ -25765,6 +25765,21 @@
] ]
} }
], ],

2
patches/chromium/web_contents.patch
View File

@@ -9,7 +9,7 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226. Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9de7bb38b5a9cb80dd31e6be6748a54c440ed075..a93db66071e8c13071a86983d3ea33284ed1577e 100644 index cee8f84216beb24f3fe38e8e33d310d839d1b2b8..787a599ec5673a7fbf11c69c9a056fc21a651322 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4197,6 +4197,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -4197,6 +4197,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,

2
patches/chromium/webview_fullscreen.patch
View File

@@ -37,7 +37,7 @@ index a13d9066d671b7c87e909434cdc81d88ee2747dc..88cc5bdaf0282d1833959d65e37a1bea
if (had_fullscreen_token && !GetView()->HasFocus()) { if (had_fullscreen_token && !GetView()->HasFocus()) {
GetView()->Focus(); GetView()->Focus();
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a93db66071e8c13071a86983d3ea33284ed1577e..d3e8e7877bfcfffd2e46c0438a244bf12af2dc67 100644 index 787a599ec5673a7fbf11c69c9a056fc21a651322..926c48f5d6ea2201a7a18a6e5e013584c06c4b66 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4493,21 +4493,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( @@ -4493,21 +4493,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(

5
shell/browser/net/url_loader_network_observer.h
View File

@@ -5,6 +5,7 @@
#ifndef ELECTRON_SHELL_BROWSER_NET_URL_LOADER_NETWORK_OBSERVER_H_ #ifndef ELECTRON_SHELL_BROWSER_NET_URL_LOADER_NETWORK_OBSERVER_H_
#define ELECTRON_SHELL_BROWSER_NET_URL_LOADER_NETWORK_OBSERVER_H_ #define ELECTRON_SHELL_BROWSER_NET_URL_LOADER_NETWORK_OBSERVER_H_
#include "base/byte_size.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/process/process_handle.h" #include "base/process/process_handle.h"
#include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -55,8 +56,8 @@ class URLLoaderNetworkObserver
const std::optional<std::string>& with_lock, const std::optional<std::string>& with_lock,
OnSharedStorageHeaderReceivedCallback callback) override; OnSharedStorageHeaderReceivedCallback callback) override;
void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash, void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
int64_t recv_bytes, base::ByteSize recv_bytes,
int64_t sent_bytes) override {} base::ByteSize sent_bytes) override {}
void OnWebSocketConnectedToPrivateNetwork( void OnWebSocketConnectedToPrivateNetwork(
const GURL& request_url, const GURL& request_url,
network::mojom::IPAddressSpace ip_address_space) override {} network::mojom::IPAddressSpace ip_address_space) override {}

5
shell/common/api/electron_api_url_loader.h
View File

@@ -10,6 +10,7 @@
#include <string_view> #include <string_view>
#include <vector> #include <vector>
#include "base/byte_size.h"
#include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h" #include "base/sequence_checker.h"
@@ -124,8 +125,8 @@ class SimpleURLLoaderWrapper final
const std::optional<std::string>& with_lock, const std::optional<std::string>& with_lock,
OnSharedStorageHeaderReceivedCallback callback) override; OnSharedStorageHeaderReceivedCallback callback) override;
void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash, void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
int64_t recv_bytes, base::ByteSize recv_bytes,
int64_t sent_bytes) override {} base::ByteSize sent_bytes) override {}
void OnWebSocketConnectedToPrivateNetwork( void OnWebSocketConnectedToPrivateNetwork(
const GURL& request_url, const GURL& request_url,
network::mojom::IPAddressSpace ip_address_space) override {} network::mojom::IPAddressSpace ip_address_space) override {}