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

chore: bump chromium to 126.0.6478.183 (31-x-y) (#42942)

Browse source 
* chore: bump chromium in DEPS to 126.0.6478.182

* chore: update patches

* chore: bump chromium in DEPS to 126.0.6478.184

* chore: bump chromium in DEPS to 126.0.6478.183

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2024-07-19 16:30:41 -05:00 • committed by GitHub
parent 6c1409ae57
commit 6249f596f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 16 additions and 16 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':
'126.0.6478.127',
'126.0.6478.183',
'node_version':
'v20.15.1',
'nan_version':

8
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -46,10 +46,10 @@ index 0be27cd41b86673d7c8a4a8d7211a19ad8c8e36c..e67d70e81cbad7520616e5d19565d59d
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 6870df1cee3431d979f2a729316d6449dbf1bea5..b049528a981b1353d0092b4f8e5cc5ab8ed4e17b 100644
index be760daff67da63b569dd4a523f9d0cef23a38aa..4e56d76c60fccbe5b63c974ffbefe3905f20f112 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7317,9 +7317,12 @@ test("unit_tests") {
@@ -7321,9 +7321,12 @@ test("unit_tests") {
"//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
]
@ -63,7 +63,7 @@ index 6870df1cee3431d979f2a729316d6449dbf1bea5..b049528a981b1353d0092b4f8e5cc5ab
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -8318,6 +8321,10 @@ test("unit_tests") {
@@ -8322,6 +8325,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
]
@ -74,7 +74,7 @@ index 6870df1cee3431d979f2a729316d6449dbf1bea5..b049528a981b1353d0092b4f8e5cc5ab
sources += [
# The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc",
@@ -8394,7 +8401,6 @@ test("unit_tests") {
@@ -8398,7 +8405,6 @@ test("unit_tests") {
}
deps += [

2
patches/chromium/can_create_window.patch
View file

@ -21,7 +21,7 @@ index 3821695f6561ff8e00d861ce49ea7ff27f5fcd7e..9829a91d59853d74b4fc1fed5032d4d0
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d08ad3ae25ab39a7c3a455271f26e339a0a15721..55b4eca20530d7bd3cbb853756d533831e6e09e3 100644
index eb1953c745c770a00da2a27d60e31e820af98e49..050126d33d440e19821adfdb365da746dbc16e5b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4668,6 +4668,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(

2
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -218,7 +218,7 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6a8f38e50a21989234ee193e6f631187c2107374..e9a9a2499ae33bd8128c8c018a26cce2115fc89d 100644
index e13bf7a29e3754f5b853a6bfcecc1bff094d9edb..0f292d2150364c755097198e326f9b60cf92f4e0 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4574,8 +4574,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

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 fd1dc75d6eb4db8e2046b5386266bfd5d247059a..44209546ae35b63c5f3b6783b8e59d2f48f5a7a7 100644
index 8dd4bcd5f587c3ac25557e12c8b86d3a257f5d0a..99b1266008e3d582817ee56793e5d10b25e0a4d9 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -171,8 +171,17 @@ void OnShareableContentCreated(SCShareableContent* content) {

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

@ -23,10 +23,10 @@ Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
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 77ee94a9c99b67116bb84bed41a6c4da3048a05a..494fb8c04116f39ab1e8d18162fac114e739931d 100644
index 6edf9572aec89faa9e0970fdac8acdae701729ff..d700ad9cf1590abc8acdfed80374d6c647a1ccd9 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -10424,6 +10424,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
@@ -10429,6 +10429,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
}
}

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

@ -87,7 +87,7 @@ index 0c7d5b2c1d3e97420913bd643bb2a524a76fc286..653793fa480f035ce11e079b370bf5ed
// 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
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c20b53273def04577d854fb23971582ec78df213..cdfba6d62294fa3cc75134c9d3e9da2e134c0e4b 100644
index 4406078b5f5874635ae7bde08e7eafb942066d8b..b751b6f2849fc1f3272d4f4a8be5a50502def25f 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -9005,7 +9005,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(

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 06d0495497697ed2716a9e665a417aa13a1883eb..d2a29aa7f38dddfb216a066201dadbe276f82684 100644
index 76c5e6b9e2cd29843d646f25be1c5db4a4e8caa6..b5cc2163c0697cf7dd64c0043de776f56bdf564a 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1309,6 +1309,11 @@
@@ -1312,6 +1312,11 @@
"includes": [8460],
},

2
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -44,7 +44,7 @@ index 74dd43d520ecb071d56064c1fa8ebb9472620614..2d6ed112db34bf06f3a75bdd24f62854
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 55b4eca20530d7bd3cbb853756d533831e6e09e3..6a8f38e50a21989234ee193e6f631187c2107374 100644
index 050126d33d440e19821adfdb365da746dbc16e5b..e13bf7a29e3754f5b853a6bfcecc1bff094d9edb 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5351,6 +5351,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {

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.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index e9a9a2499ae33bd8128c8c018a26cce2115fc89d..debd0bcb4f4b5fcb1a26d21b5e44f7d53624e961 100644
index 0f292d2150364c755097198e326f9b60cf92f4e0..3652f675cfccb39fd88d7c43c720bb44e057a8a7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3578,6 +3578,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,

2
patches/chromium/webview_fullscreen.patch
View file

@ -37,7 +37,7 @@ index 9829a91d59853d74b4fc1fed5032d4d090912987..d655cf46917c34f5b71b2ed0478d4ee4
if (had_fullscreen_token && !GetView()->HasFocus())
GetView()->Focus();
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index debd0bcb4f4b5fcb1a26d21b5e44f7d53624e961..c20b53273def04577d854fb23971582ec78df213 100644
index 3652f675cfccb39fd88d7c43c720bb44e057a8a7..4406078b5f5874635ae7bde08e7eafb942066d8b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3833,21 +3833,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(