Skip to content

Commit 63c3635

Browse files
electron-roller[bot]samuelmaddockdeepak1556clavinjkleinsc
authored andcommitted
chore: bump chromium to 139.0.7219.0 (main) (electron#47348)
* chore: bump chromium in DEPS to 139.0.7205.0 * 6543986: Mac: decouple deserializing and applying sandbox policy Refs https://chromium-review.googlesource.com/c/chromium/src/+/6543986 * 6580079: Reland 'Remove the third-party blocking feature' Refs https://chromium-review.googlesource.com/c/chromium/src/+/6580079 * 6505716: guest-contents: Add components/guest_contents Refs https://chromium-review.googlesource.com/c/chromium/src/+/6505716 * 6572556: Move LogMessageManager out of gpu_service_impl.cc. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6572556 * 6566111: Change UtilityProcessHost to manage its instance internally Refs https://chromium-review.googlesource.com/c/chromium/src/+/6566111 * 6550237: Rename ReconnectEventObserver to ConnectionChangeObserverClient Refs https://chromium-review.googlesource.com/c/chromium/src/+/6550237 * 6565918: Validate path is valid UTF8 in SelectFileDialogLinuxPortal Refs https://chromium-review.googlesource.com/c/chromium/src/+/6565918 * 6579713: Remove base::NotFatalUntil::M130 usage 6566111: Change UtilityProcessHost to manage its instance internally Refs https://chromium-review.googlesource.com/c/chromium/src/+/6579713 https://chromium-review.googlesource.com/c/chromium/src/+/6566111 * chore: update chromium patches * chore: update remaining patches * fixup! 6566111: Change UtilityProcessHost to manage its instance internally Refs https://chromium-review.googlesource.com/c/chromium/src/+/6566111 * 6577970: Remove superfluous includes for base/strings/stringprintf.h in headers Refs https://chromium-review.googlesource.com/c/chromium/src/+/6577970 * 6568811: Add FunctionCall structured metrics event for DevTools Refs https://chromium-review.googlesource.com/c/chromium/src/+/6568811 * [PDF Ink Signatures] Support PdfAnnotationsEnabled policy https://chromium-review.googlesource.com/c/chromium/src/+/6558970 * build: disable libcxx modules for rbe * chore: bump chromium in DEPS to 139.0.7217.0 * chore: bump chromium in DEPS to 139.0.7218.0 * chore: update patches fix_use_delegated_generic_capturer_when_available.patch was updated to handle a small change: 6582142: Use content::Create*Capturer in DesktopCaptureDevice. | https://chromium-review.googlesource.com/c/chromium/src/+/6582142 * chore: bump chromium in DEPS to 139.0.7219.0 * chore: update patches * 6594615: Change Chromium's deployment target to macOS 12 https://chromium-review.googlesource.com/c/chromium/src/+/6594615 Updated the assertion message to match the docs structure now too. I removed the callout to the supported versions doc because it has moved and doesn't contain minimum platform version information. * 6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_ https://chromium-review.googlesource.com/c/chromium/src/+/6606232 |NativeWindow::GetContentMinimumSize| and |NativeWindow::GetContentMaximumSize| may be good opportunities for a refactor now. * add squirrel.mac patch for removed function This was triggered by the macOS 12.0 deployment upgrade change. See: https://developer.apple.com/documentation/coreservices/1444079-uttypeconformsto?language=objc * 6582142: Use content::Create*Capturer in DesktopCaptureDevice. https://chromium-review.googlesource.com/c/chromium/src/+/6582142 * 6579732: Two minor API "quality of life" cleanups in OSCrypt Async https://chromium-review.googlesource.com/c/chromium/src/+/6579732 * chore: add include for base::SingleThreadTaskRunner Not sure what change caused this, I expect it would be a removed include somewhere else, but it's likely not important to track down. * chore: update libcxx filenames * chore: update CI build-tools commit target for macOS SDK 15.4 The following change uses an API that was added in the macOS 15.4 SDK. Support for that SDK version was added later than the current build-tools commit target. 6575804: Use a quick-and-dirty solution to avoid glitching with paste-and-go | https://chromium-review.googlesource.com/c/chromium/src/+/6575804 See: https://developer.apple.com/documentation/appkit/nspasteboard/accessbehavior-swift.enum?language=objc * fixup! 6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_ https://chromium-review.googlesource.com/c/chromium/src/+/6606232 * chore: bump chromium in DEPS to 139.0.7220.0 * chore: update patches Minor changes due to: 6613978: pwa: let events fall through in the transparent area of TopContainerView | https://chromium-review.googlesource.com/c/chromium/src/+/6613978 6614778: Refactor auto pip tab observer for Android support | https://chromium-review.googlesource.com/c/chromium/src/+/6614778 * 6543986: Mac: decouple deserializing and applying sandbox policy https://chromium-review.googlesource.com/c/chromium/src/+/6543986 The DecodeVarInt and DecodeString functions look benign from a MAS perspective. I suspect they were patched out to avoid "unused function" errors. Their complements for encoding are unpatched, supporting this idea. The code that uses these functions was refactored out of the section that we patch out. Instead of patching out that new function, I decided to treat it the same as the serialization function that is unpatched. * chore: bump chromium in DEPS to 139.0.7222.0 * chore: bump chromium in DEPS to 139.0.7224.0 * chore: bump chromium in DEPS to 139.0.7226.0 * chore: bump chromium in DEPS to 139.0.7228.0 * chore: update patches * Don't use static variable for UseExternalPopupMenus https://chromium-review.googlesource.com/c/chromium/src/+/6534657 * Reland "Roll libc++ from a01c02c9d4ac to a9cc573e7c59 https://chromium-review.googlesource.com/c/chromium/src/+/6607589 * chore: bump chromium in DEPS to 139.0.7219.0 * chore: update patches * revert Don't use static variable for UseExternalPopupMenus * tls: remove deprecated tls.createSecurePair and SecurePair nodejs/node#57361 * Revert "Reland "Roll libc++ from a01c02c9d4ac to a9cc573e7c59" This reverts commit 33e1436. * test: cleanup api-desktop-capturer-spec.ts * test: more cleanup of api-desktop-capturer-spec.ts * chore: debug dcheck error in webrtc on linux * fixup patch * add debugging to desktop capturer spec * test: fixup api-desktop-capturer-spec.ts for linux * chore: remove debugging patch * Revert "fixup! 6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_ https://chromium-review.googlesource.com/c/chromium/src/+/6606232" This reverts commit 32e7565. * Revert "6606232: [views] Remove DesktopWindowTreeHostWin::window_enlargement_" This reverts commit 89c51aa. * [views] Remove DesktopWindowTreeHostWin::window_enlargement_ https://chromium-review.googlesource.com/c/chromium/src/+/6606232 Reverting as we need this functionality for now. * fixup: remove patch that was accidentally added back --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <[email protected]> Co-authored-by: deepak1556 <[email protected]> Co-authored-by: clavin <[email protected]> Co-authored-by: John Kleinschmidt <[email protected]>
1 parent 2345335 commit 63c3635

File tree

101 files changed

+990
-4881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+990
-4881
lines changed

.github/actions/install-build-tools/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
git config --global core.fscache true
1414
git config --global core.preloadindex true
1515
fi
16-
export BUILD_TOOLS_SHA=6e8526315ea3b4828882497e532b8340e64e053c
16+
export BUILD_TOOLS_SHA=0a7f6bef9453ceee45612442660ca16d2c40171b
1717
npm i -g @electron/build-tools
1818
# Update depot_tools to ensure python
1919
e d update_depot_tools

BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ if (is_mac) {
3838
import("build/rules.gni")
3939

4040
assert(
41-
mac_deployment_target == "11.0",
42-
"Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
41+
mac_deployment_target == "12.0",
42+
"Chromium has updated the mac_deployment_target, please update this assert and flag this as a breaking change (docs/breaking-changes.md)")
4343
}
4444

4545
if (is_linux) {

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars = {
44
'chromium_version':
5-
'138.0.7190.0',
5+
'139.0.7219.0',
66
'node_version':
77
'v22.16.0',
88
'nan_version':

docs/breaking-changes.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ This document uses the following convention to categorize breaking changes:
1212
* **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
1313
* **Removed:** An API or feature was removed, and is no longer supported by Electron.
1414

15+
## Planned Breaking API Changes (38.0)
16+
17+
### Removed: macOS 11 support
18+
19+
macOS 11 (Big Sur) is no longer supported by [Chromium](https://chromium-review.googlesource.com/c/chromium/src/+/6594615).
20+
21+
Older versions of Electron will continue to run on Big Sur, but macOS 12 (Monterey)
22+
or later will be required to run Electron v38.0.0 and higher.
23+
1524
## Planned Breaking API Changes (37.0)
1625

1726
### Utility Process unhandled rejection behavior change

filenames.libcxx.gni

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ libcxx_headers = [
2626
"//third_party/libc++/src/include/__algorithm/find_segment_if.h",
2727
"//third_party/libc++/src/include/__algorithm/for_each.h",
2828
"//third_party/libc++/src/include/__algorithm/for_each_n.h",
29+
"//third_party/libc++/src/include/__algorithm/for_each_n_segment.h",
2930
"//third_party/libc++/src/include/__algorithm/for_each_segment.h",
3031
"//third_party/libc++/src/include/__algorithm/generate.h",
3132
"//third_party/libc++/src/include/__algorithm/generate_n.h",
@@ -1431,6 +1432,7 @@ libcxx_headers = [
14311432
"//third_party/libc++/src/include/__type_traits/is_reference.h",
14321433
"//third_party/libc++/src/include/__type_traits/is_reference_wrapper.h",
14331434
"//third_party/libc++/src/include/__type_traits/is_referenceable.h",
1435+
"//third_party/libc++/src/include/__type_traits/is_replaceable.h",
14341436
"//third_party/libc++/src/include/__type_traits/is_same.h",
14351437
"//third_party/libc++/src/include/__type_traits/is_scalar.h",
14361438
"//third_party/libc++/src/include/__type_traits/is_signed.h",

patches/boringssl/expose_ripemd160.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ index e04b80cd6a1a215fc87f8fd8d750c3d258c3974f..8fdf1c624794f568bfc77b7b6b0c510b
8282

8383
void EVP_MD_do_all(void (*callback)(const EVP_MD *cipher, const char *name,
8484
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
85-
index 6abab7693ef2cf418e64d4bf5d53e7e0821cb731..ecbf81be6888cf2e95008da054cf4d3d7df6ad49 100644
85+
index b5f76c34efea47fb52f1642c8ca7e8a78c1ae678..b2420a9614453de35e1918d65d42ff95fbf9cf9e 100644
8686
--- a/include/openssl/digest.h
8787
+++ b/include/openssl/digest.h
8888
@@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);

patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 2cdcbc346175eeee69402ecee7f169e61c655199..f7226fe711e4214b216ea2c5173a0212
2020

2121
case ssl_open_record_error:
2222
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
23-
index 69f3fe2f5c193a30dd90368048804109db563da3..52393736adee2d50de218ac86c9e7cbcd9d6bf6d 100644
23+
index c09c0715cc36841fa2bbd221238ea5427ed0c2cf..6936d4d67a58af81d7ae38907d71b1ae38038245 100644
2424
--- a/ssl/ssl_lib.cc
2525
+++ b/ssl/ssl_lib.cc
2626
@@ -1204,7 +1204,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {

patches/chromium/.patches

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ fix_win32_synchronous_spellcheck.patch
134134
fix_enable_wrap_iter_in_string_view_and_array.patch
135135
chore_grandfather_in_electron_views_and_delegates.patch
136136
refactor_patch_electron_permissiontypes_into_blink.patch
137-
revert_webgl_add_stub_webgl_2_renderingcontextwebgpu.patch
137+
revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch

patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
1010
This should be upstreamed.
1111

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
index 73be6273b320574c22fd12e07b93dc3cffaa1be9..58a34cc5b583a7111decf14b755afbb82ba94765 100644
13+
index 5cf9e02f97e1378b0b1a55feb007b7d664fc4a84..d1fdf00a1b65fe0f5510608c165df93cf6c13e38 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -268,6 +268,10 @@ int GpuMain(MainFunctionParams parameters) {
16+
@@ -269,6 +269,10 @@ int GpuMain(MainFunctionParams parameters) {
1717
// to the GpuProcessHost once the GpuServiceImpl has started.
18-
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
18+
viz::GpuLogMessageManager::GetInstance()->InstallPreInitializeLogHandler();
1919

2020
+ auto* client = GetContentClient()->gpu();
2121
+ if (client)
@@ -24,7 +24,7 @@ index 73be6273b320574c22fd12e07b93dc3cffaa1be9..58a34cc5b583a7111decf14b755afbb8
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -377,7 +381,6 @@ int GpuMain(MainFunctionParams parameters) {
27+
@@ -378,7 +382,6 @@ int GpuMain(MainFunctionParams parameters) {
2828
#endif
2929
const bool dead_on_arrival = !init_success;
3030

patches/chromium/add_didinstallconditionalfeatures.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ index db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c9
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index 3fa43adedd6ff0258edd195bde1e68977cff3a7c..7fe443aad2ad6207aa46daddea46baa3eb998bc3 100644
26+
index b0d9b07772676576737bb731e1e81ba4d0418d6d..66e9de17ba9994b39b159e83a73c3d6b6cc6cc69 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
2929
@@ -4808,6 +4808,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -79,7 +79,7 @@ index f7e0144c74f879e9b29871d7c372b99e127966bb..c3cd7b77ed282f212a56d151dc3fbec3
7979
if (World().IsMainWorld()) {
8080
probe::DidCreateMainWorldContext(GetFrame());
8181
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
82-
index e52a535450964b0938b66f7506225fda0cde04a2..841e9b36df4c32040d2b3c71514266fc330c99c7 100644
82+
index 64d08b9257e329af873230bc07e2f52ef86fe00d..44edf0f964b1e0002b679ba07b97e317eb3f8974 100644
8383
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
8484
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
8585
@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -92,7 +92,7 @@ index e52a535450964b0938b66f7506225fda0cde04a2..841e9b36df4c32040d2b3c71514266fc
9292
int32_t world_id) = 0;
9393
virtual bool AllowScriptExtensions() = 0;
9494
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
95-
index 96fc9e0646f943e86e927de2686a8da94625ae6c..30e9721cccd285a347f35e2d7a539547ac41247c 100644
95+
index 94bec80d8b6ace7031ea7fe97afcbe5a509647da..969a262bfb0ef0e7715bbf009fa525a03cbc2063 100644
9696
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9797
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9898
@@ -295,6 +295,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 96fc9e0646f943e86e927de2686a8da94625ae6c..30e9721cccd285a347f35e2d7a539547
110110
v8::Local<v8::Context> context,
111111
int32_t world_id) {
112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
113-
index 5dbc9c1f5f45c8753dd5510ffad2c5d4c20c814b..4223ba0db6c267a4574ab4a76c5a6f365223416c 100644
113+
index 683a8116c18952f620115d0258fb568a467a5e8d..c520c13f2272617b6e2ac4d46a44fda351cf6644 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
116116
@@ -82,6 +82,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,7 +123,7 @@ index 5dbc9c1f5f45c8753dd5510ffad2c5d4c20c814b..4223ba0db6c267a4574ab4a76c5a6f36
123123
int32_t world_id) override;
124124

125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index 069ccf925bc0c6f1a5b707670cc3c931dd2a25a9..49ccc167276ed544c800483c4a8655b254304ee8 100644
126+
index 9e83bb434f0414822962d263b7baa944347aba85..3519e48c6771e8fb88626eed9d7adcd2ae382034 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129129
@@ -418,6 +418,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {

0 commit comments

Comments
 (0)