Browse Source

chore: bump chromium to 128.0.6613.120 (32-x-y) (#43502)

* chore: bump chromium in DEPS to 128.0.6613.113

* chore: bump chromium in DEPS to 128.0.6613.120

* 5811749: Revert ScopeInfo reuse work on the 12.8 branch

https://chromium-review.googlesource.com/c/v8/v8/+/5811749

* chore: update patches

* chore: free up macos disk space as soon as possible

* build: free up disk space on gn check too

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <[email protected]>
electron-roller[bot] 7 months ago
parent
commit
1ca0ce0a17

+ 1 - 1
DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '128.0.6613.84',
+    '128.0.6613.120',
   'node_version':
     'v20.16.0',
   'nan_version':

+ 5 - 5
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch

@@ -159,7 +159,7 @@ index 94a028be3c315edc0056408ab9ab41b6b001a1c1..0d830234edb5621f57e39f4a951d357a
  
  }  // namespace base
 diff --git a/components/os_crypt/sync/BUILD.gn b/components/os_crypt/sync/BUILD.gn
-index 4fe7a0bfaa5b3398372f55c6454e738f140efe6b..b1c70281c45aaca4ae483f1f28e9d21929d17815 100644
+index 3b81e00e1535ec729a521b83fe2471985d177e5c..b3706a4a0f77f8e5fbae3df97153b9cbed7d01f0 100644
 --- a/components/os_crypt/sync/BUILD.gn
 +++ b/components/os_crypt/sync/BUILD.gn
 @@ -46,6 +46,7 @@ component("os_crypt") {
@@ -303,7 +303,7 @@ index 945b01f2132547fa0f6a97ee4895994c500d1410..c01b2fdecf9b54fa01e5be9f45eaa234
  // The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
  // can only be accomplished by overriding methods.
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a91334c093c1a 100644
+index 02bd5710e0b54653cd298785245658e938a40d1f..aab09311e15b8081b7ce572e76f86021f2b0cf32 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 @@ -106,14 +106,18 @@ void OrderChildWindow(NSWindow* child_window,
@@ -334,7 +334,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
  @implementation NativeWidgetMacNSWindowTitledFrame
  - (void)mouseDown:(NSEvent*)event {
    if (self.window.isMovable)
-@@ -214,6 +220,8 @@ - (BOOL)usesCustomDrawing {
+@@ -179,6 +185,8 @@ - (BOOL)usesCustomDrawing {
  }
  @end
  
@@ -343,7 +343,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
  @implementation NativeWidgetMacNSWindow {
   @private
    CommandDispatcher* __strong _commandDispatcher;
-@@ -402,6 +410,8 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -367,6 +375,8 @@ - (NSAccessibilityRole)accessibilityRole {
  
  // NSWindow overrides.
  
@@ -352,7 +352,7 @@ index 8206b065e36ea5264ab01f0abb0c60c7f059cee5..219e2e73a986ed90585adc2baf1a9133
  + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    if (windowStyle & NSWindowStyleMaskTitled) {
      if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
-@@ -413,6 +423,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
+@@ -378,6 +388,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    return [super frameViewClassForStyleMask:windowStyle];
  }
  

+ 0 - 1
patches/v8/.patches

@@ -1,3 +1,2 @@
 chore_allow_customizing_microtask_policy_per_context.patch
 deps_add_v8_object_setinternalfieldfornodecore.patch
-fix_disable_scope_reuse_associated_dchecks.patch

+ 0 - 54
patches/v8/fix_disable_scope_reuse_associated_dchecks.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Calvin Watford <[email protected]>
-Date: Wed, 17 Jul 2024 12:52:10 -0600
-Subject: fix: disable scope reuse & associated dchecks
-
-This change was introduced in https://crrev.com/c/5630974 which reuses
-scope info objects across allocations. Unfortunately, this change seems
-to be not yet fully cooked and causes crashes with normal usage of V8.
-
-In particular, Node.js call's V8's `v8::ScriptCompiler::CompileFunction`
-method. This ends up wrapping the source code in a function, which this
-code is not yet prepared to handle. The generated function wrapper
-(created by V8) has no source position, so it reports being at the start
-of the source, which may overlap with other scopes that are in the
-original source. This new feature adds a "UniqueIdInScript" concept that
-is derived from the source position of a scope, along with the invariant
-that inner scopes have a higher ID than outer scopes, which does not
-hold for the above situation.
-
-This patch is not intended to remain indefinitely. Once the upstream
-feature stabilizes, we can remove this patch. Unfortunately, there is no
-public tracking bug for this feature nor the crashes its been causing,
-so we'll have to keep an eye on this for the time being.
-
-diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
-index e2b2405aaae8fb324ab12250fd3ee767fd3a7ce4..e83a8a4ffbc31ec1336d5bd289039f9ba31a3052 100644
---- a/src/ast/scopes.cc
-+++ b/src/ast/scopes.cc
-@@ -2713,9 +2713,9 @@ void Scope::AllocateScopeInfosRecursively(
- 
-   // Allocate ScopeInfos for inner scopes.
-   for (Scope* scope = inner_scope_; scope != nullptr; scope = scope->sibling_) {
--    DCHECK_GT(scope->UniqueIdInScript(), UniqueIdInScript());
--    DCHECK_IMPLIES(scope->sibling_, scope->sibling_->UniqueIdInScript() !=
--                                        scope->UniqueIdInScript());
-+    // DCHECK_GT(scope->UniqueIdInScript(), UniqueIdInScript());
-+    // DCHECK_IMPLIES(scope->sibling_, scope->sibling_->UniqueIdInScript() !=
-+    //                                     scope->UniqueIdInScript());
-     if (!scope->is_function_scope() ||
-         scope->AsDeclarationScope()->ShouldEagerCompile()) {
-       scope->AllocateScopeInfosRecursively(isolate, next_outer_scope,
-diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
-index 98f060c2c0338b3abdc7f46740999c6d8645f65e..2f899c43a3296fac6a2c85111fa57e8b8c34a586 100644
---- a/src/flags/flag-definitions.h
-+++ b/src/flags/flag-definitions.h
-@@ -996,6 +996,8 @@ DEFINE_BOOL(trace_track_allocation_sites, false,
- DEFINE_BOOL(trace_migration, false, "trace object migration")
- DEFINE_BOOL(trace_generalization, false, "trace map generalization")
- 
-+// 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")
-