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

chore: bump chromium to 113.0.5651.0 (main) (#37553)

Browse source 
* chore: bump chromium in DEPS to 113.0.5645.0

* chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch

Xref: 4300129

Fix simple code shear

* chore: update patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch

Xref: 4297496

Xref: 4327491

patch-fuzz update; no manual changes

* chore: remove patches/chromium/fix_x11_window_restore_minimized_maximized_window.patch

Xref: 4252946

Upstreamed by zcbenz, so local patch is no longer needed

* chore: update chromium/printing.patch

Xref: 4313019

Remove cookie parameter from PrintViewManagerBase::UpdatePrintSettings()

* chore: remove NOTIMPLEMENTED BrowserProcessImpl::GetBreadcrumbPersistentStorageManager()

Xref: 4247145

method removed upstream, so we do not need to add a stub for it in the subclass

* chore: remove PrintViewManagerElectron::UpdatePrintSettings()

Xref: 4313019

Previously, our implementation checked to see if we recognized the
cookie param that was passed in. If so, we reported a bad message.
Otherwise, we passed it up to the base class' UpdatePrintSettings().

CL4313019 removed the cookie param, so checking for a bad cookie
param is no longer necessary / no longer possible. Since the only
remaining task was to pass the work up to the base class, this commit
removes the subclass implmentation entirely.

* chore: update patches

* chore: bump chromium in DEPS to 113.0.5647.0

* chore: bump chromium in DEPS to 113.0.5649.2

* chore: bump chromium in DEPS to 113.0.5651.0

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-03-15 18:20:32 +09:00 • committed by GitHub
parent bf1cc1aeb2
commit 061e2e5e73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 224 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/chromium/resource_file_conflict.patch
View file

@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 5d54960da4162953561903862f590fd0a5047ea2..53363189fe649fa92040811ee9e858e9363f29e7 100644
index 931710cb0d5c9db6a85ffc580c3ef52d339c3413..9175a59085ffd7a2225e09ad03806782cc54879b 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1556,7 +1556,7 @@ if (is_chrome_branded && !is_android) {
@@ -1553,7 +1553,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index 5d54960da4162953561903862f590fd0a5047ea2..53363189fe649fa92040811ee9e858e9
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1585,6 +1585,12 @@ if (!is_android) {
@@ -1582,6 +1582,12 @@ if (!is_android) {
}
}
@ -74,6 +74,6 @@ index 5d54960da4162953561903862f590fd0a5047ea2..53363189fe649fa92040811ee9e858e9
+ }
+}
+
repack("unit_tests_pak") {
repack("browser_tests_pak") {
testonly = true
sources = [ "$root_gen_dir/chrome/chrome_test_resources.pak" ]
sources = [ "$root_gen_dir/chrome/webui_test_resources.pak" ]