From e32e85abb2d9765988b3f8bce239364491775f27 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:47:11 -0400 Subject: [PATCH] chore: bump chromium to 130.0.6723.19 (33-x-y) (#43975) * chore: bump chromium in DEPS to 130.0.6723.19 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- DEPS | 2 +- patches/chromium/can_create_window.patch | 4 ++-- ...t_allow_-4_as_a_macos_screen_share_id.patch | 8 ++++---- ...ading_non-standard_schemes_in_iframes.patch | 4 ++-- ...s_avoid_private_macos_api_usage.patch.patch | 2 +- ...reated_to_allow_for_browser_initiated.patch | 4 ++-- ...xpose_hostimportmoduledynamically_and.patch | 16 ++++++++-------- patches/chromium/scroll_bounce_flag.patch | 2 +- patches/chromium/webview_fullscreen.patch | 4 ++-- ...isable_scope_reuse_associated_dchecks.patch | 18 ------------------ 10 files changed, 23 insertions(+), 41 deletions(-) diff --git a/DEPS b/DEPS index 20d213c69ae8..47c98c10a15f 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '130.0.6723.6', + '130.0.6723.19', 'node_version': 'v20.17.0', 'nan_version': diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index fc4a33030567..aa9c831a9ce9 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 0236631b56d799a87ee33ebbc03379028119ceec..f81f72309c2949230840bb8ba83adf227a10dee5 100644 +index 2fd13bfb778f31eff97ced7d5e41de30398b0a74..99a54798649942244c2ee51d1d10da8a8a637bfa 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8930,6 +8930,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -8945,6 +8945,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, diff --git a/patches/chromium/feat_allow_-4_as_a_macos_screen_share_id.patch b/patches/chromium/feat_allow_-4_as_a_macos_screen_share_id.patch index e36e76fe8321..869ade5f2073 100644 --- a/patches/chromium/feat_allow_-4_as_a_macos_screen_share_id.patch +++ b/patches/chromium/feat_allow_-4_as_a_macos_screen_share_id.patch @@ -12,10 +12,10 @@ Where the last digit represents the window id and decrements with each requested screen share. 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 27b7edd2e99f36ebf3381781f2d2b3e7aff3eca1..30b3c896d5d6f12d63a7e12df0c90c767a5d5a71 100644 +index 1c2d0c6dd4101fe0bac69e3018bbbedadce224cc..e407382a3463374fd57a83d70c5f96dca5825faf 100644 --- a/content/browser/media/capture/screen_capture_kit_device_mac.mm +++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm -@@ -503,7 +503,9 @@ void OnStart(std::optional use_native_picker) override { +@@ -510,7 +510,9 @@ void OnStart(std::optional use_native_picker) override { if (@available(macOS 15.0, *)) { constexpr bool DefaultUseNativePicker = true; @@ -27,10 +27,10 @@ index 27b7edd2e99f36ebf3381781f2d2b3e7aff3eca1..30b3c896d5d6f12d63a7e12df0c90c76 ScreenCaptureKitDeviceMac::active_streams_++; picker.maximumStreamCount = @(ScreenCaptureKitDeviceMac::active_streams_); diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc -index f38ea5df3b6c694aed3a54486733130a2bec606b..f34ea831e3f0988b85940b11ca5484069f3013cb 100644 +index d162612dc70a2b57190aaf558aca8f46cbdedcad..bab2f0282b191a4263fc964125e199e52c62554b 100644 --- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc -@@ -316,8 +316,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync( +@@ -332,8 +332,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync( break; } diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index b8b5e3fd35b6..e317b120d815 100644 --- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch +++ b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch @@ -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 e6b11183c78bdc1a78e9fac5ff9523cfb4a8e96c..37bf142d932327132176b5e2cd882aff54307858 100644 +index 22bb23e6a84d3b6686461f87e846125ad7484742..198403ec544e71f50c8555d131015b805124ce7a 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -10753,6 +10753,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { +@@ -10757,6 +10757,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { "blob"); } diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index 4aa6dac8210c..967b916adce6 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to system priority. diff --git a/base/BUILD.gn b/base/BUILD.gn -index d6dbc2c38b40123860654132386da0a2aadeac5a..49d4366523aa635ad1d38dcfe74b05661e5dc5bc 100644 +index 9247e9b3f4c92e6f573898049bca784cccb4b19c..a615fd0af29052246890ab2bf21a3d35b7637864 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1027,6 +1027,7 @@ component("base") { diff --git a/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch b/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch index 9f43854ba572..48e420275689 100644 --- a/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch +++ b/patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch @@ -10,10 +10,10 @@ an about:blank check to this area. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 243d756fbdd65fbef963f6407e1506cb2d82de86..900af02d2dc5569292aeec77a303a5420654250f 100644 +index 379da2b28724fb271338f797a116e5c44986c324..1277ee2264131e5da937b4c01f5c259eded2df39 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -785,8 +785,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( +@@ -778,8 +778,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( // TODO(crbug.com/40092527): Consider adding a separate boolean that // tracks this instead of piggybacking `origin_calculation_debug_info`. if (renderer_side_origin.opaque() && diff --git a/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch b/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch index 34241400e0ca..adfa338ab932 100644 --- a/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch +++ b/patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch @@ -7,10 +7,10 @@ Subject: refactor: expose HostImportModuleDynamically and This is so that Electron can blend Blink's and Node's implementations of these isolate handlers. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -index f0d66b34a985881e428ff70b283076e4b6775114..ff52f78a35eefd109a3147424365823f4e36fae2 100644 +index fbe362fe42a7438381d130be096d086a2c1e527d..feb74bb090f79d31790d6cda11330dbb162c072f 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -@@ -641,7 +641,9 @@ bool WasmJSPromiseIntegrationEnabledCallback(v8::Local context) { +@@ -609,7 +609,9 @@ bool WasmJSPromiseIntegrationEnabledCallback(v8::Local context) { execution_context); } @@ -21,7 +21,7 @@ index f0d66b34a985881e428ff70b283076e4b6775114..ff52f78a35eefd109a3147424365823f v8::Local context, v8::Local v8_host_defined_options, v8::Local v8_referrer_resource_url, -@@ -719,7 +721,7 @@ v8::MaybeLocal HostImportModuleDynamically( +@@ -687,7 +689,7 @@ v8::MaybeLocal HostImportModuleDynamically( } // https://html.spec.whatwg.org/C/#hostgetimportmetaproperties @@ -30,7 +30,7 @@ index f0d66b34a985881e428ff70b283076e4b6775114..ff52f78a35eefd109a3147424365823f v8::Local module, v8::Local meta) { v8::Isolate* isolate = context->GetIsolate(); -@@ -762,9 +764,6 @@ std::ostream& operator<<(std::ostream& os, const PrintV8OOM& oom_details) { +@@ -730,9 +732,6 @@ std::ostream& operator<<(std::ostream& os, const PrintV8OOM& oom_details) { return os; } @@ -40,7 +40,7 @@ index f0d66b34a985881e428ff70b283076e4b6775114..ff52f78a35eefd109a3147424365823f void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { // Set up garbage collection before setting up anything else as V8 may trigger // GCs during Blink setup. -@@ -784,9 +783,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { +@@ -752,9 +751,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { isolate->SetWasmJSPIEnabledCallback(WasmJSPromiseIntegrationEnabledCallback); isolate->SetSharedArrayBufferConstructorEnabledCallback( SharedArrayBufferConstructorEnabledCallback); @@ -53,12 +53,12 @@ index f0d66b34a985881e428ff70b283076e4b6775114..ff52f78a35eefd109a3147424365823f #if BUILDFLAG(IS_WIN) diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h -index c3aa714d99a398e29e52c3acb16fc555231d0e4a..6698228c6e76676c6a5cdb39c0d17e2add5547df 100644 +index 2e0fd8cdef733677f8e1d32b3d8e0c635e0a5052..1df4517f9b5926c1dc5333aa6fc9cc1290256c70 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h -@@ -85,6 +85,17 @@ class CORE_EXPORT V8Initializer { +@@ -84,6 +84,17 @@ class CORE_EXPORT V8Initializer { + v8::Local data); static void PromiseRejectHandlerInMainThread(v8::PromiseRejectMessage data); - static void ExceptionPropagationCallback(v8::ExceptionPropagationMessage); + static v8::MaybeLocal HostImportModuleDynamically( + v8::Local context, diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index 0bf8ee779c5f..f4541d70551b 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/chromium/scroll_bounce_flag.patch @@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch Patch to make scrollBounce option work. diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 34d250220f97ff073419f479c678ee3569ea3ed2..307fe24a0137bcd503e1dbe66f9745634b549de2 100644 +index 8fbed3f73560e4a083b016439239872b853ca4e1..f629abca6367a3e687a34a44ebc40c1554cfedd2 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -1281,7 +1281,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index ad52cc0e1bdd..8354687d6ace 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -15,10 +15,10 @@ Note that we also need to manually update embedder's `api::WebContents::IsFullscreenForTabOrPending` value. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index f81f72309c2949230840bb8ba83adf227a10dee5..243d756fbdd65fbef963f6407e1506cb2d82de86 100644 +index 99a54798649942244c2ee51d1d10da8a8a637bfa..379da2b28724fb271338f797a116e5c44986c324 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8045,6 +8045,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -8060,6 +8060,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } diff --git a/patches/v8/fix_disable_scope_reuse_associated_dchecks.patch b/patches/v8/fix_disable_scope_reuse_associated_dchecks.patch index d6ad0994d43b..0935c20d75de 100644 --- a/patches/v8/fix_disable_scope_reuse_associated_dchecks.patch +++ b/patches/v8/fix_disable_scope_reuse_associated_dchecks.patch @@ -41,21 +41,3 @@ index 57a9dca1a84dee95d36c2b296fc170399db3e213..5db78a650068faa0bacf05b13d86860c } #endif if (!scope->is_function_scope() || -diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h -index 69946faf5ed74c19122d6cf92112eb32329d2e6e..6f91778ee8a89f1efec365053bdf3e3c27690de1 100644 ---- a/src/flags/flag-definitions.h -+++ b/src/flags/flag-definitions.h -@@ -963,7 +963,12 @@ DEFINE_BOOL(trace_track_allocation_sites, false, - DEFINE_BOOL(trace_migration, false, "trace object migration") - DEFINE_BOOL(trace_generalization, false, "trace map generalization") - --DEFINE_BOOL(reuse_scope_infos, true, "reuse scope infos from previous compiles") -+// ELECTRON: The following flag should remain false by default until we can -+// remove `fix_disable_scope_reuse_associated_dchecks.patch` -+DEFINE_BOOL(reuse_scope_infos, false, -+ "reuse scope infos from previous compiles") -+ -+DEFINE_IMPLICATION(fuzzing, reuse_scope_infos) - - // Flags for Sparkplug - #undef FLAG