From 526e2f8916fb607c4ee86d1f61aca6b546aae33f Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 16:02:39 -0400 Subject: [PATCH] chore: bump chromium to 124.0.6367.207 (30-x-y) (#42166) * chore: bump chromium in DEPS to 124.0.6367.207 * chore: update patches * chore: update docker container version to fix broken testing https://github.com/electron/electron/runs/24917447946 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- .circleci/config/base.yml | 2 +- DEPS | 2 +- patches/v8/.patches | 1 - patches/v8/cherry-pick-f320600cd1f4.patch | 27 ----------------------- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 patches/v8/cherry-pick-f320600cd1f4.patch diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 6c5b4e343469..b1f1bb7e633e 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -56,7 +56,7 @@ executors: # 2xlarge should not be used directly, use the pipeline param instead enum: ["medium", "electronjs/aks-linux-medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"] docker: - - image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328 + - image: ghcr.io/electron/build:9a43c14f5c19be0359843299f79e736521373adc resource_class: << parameters.size >> macos: diff --git a/DEPS b/DEPS index 4c03023e2dca..a74f071b8483 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '124.0.6367.201', + '124.0.6367.207', 'node_version': 'v20.11.1', 'nan_version': diff --git a/patches/v8/.patches b/patches/v8/.patches index dd5b93a8df77..280a34b93603 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -1,3 +1,2 @@ chore_allow_customizing_microtask_policy_per_context.patch deps_add_v8_object_setinternalfieldfornodecore.patch -cherry-pick-f320600cd1f4.patch diff --git a/patches/v8/cherry-pick-f320600cd1f4.patch b/patches/v8/cherry-pick-f320600cd1f4.patch deleted file mode 100644 index 57fb23cfe84a..000000000000 --- a/patches/v8/cherry-pick-f320600cd1f4.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shu-yu Guo -Date: Thu, 9 May 2024 12:03:28 -0700 -Subject: Only normalize JSObject targets in SetOrCopyDataProperties - -Bug: 339458194 -Change-Id: I4d6eebdd921971fa28d7c474535d978900ba633f -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5527397 -Reviewed-by: Rezvan Mahdavi Hezaveh -Commit-Queue: Shu-yu Guo -Cr-Commit-Position: refs/heads/main@{#93811} - -diff --git a/src/objects/js-objects.cc b/src/objects/js-objects.cc -index e5a03dff14835e98a53ff7a40c5c60b362c4afec..2f3ab484cdc010915c57cd6112c4330c4ed69c6c 100644 ---- a/src/objects/js-objects.cc -+++ b/src/objects/js-objects.cc -@@ -432,9 +432,7 @@ Maybe JSReceiver::SetOrCopyDataProperties( - Nothing()); - - if (!from->HasFastProperties() && target->HasFastProperties() && -- !IsJSGlobalProxy(*target)) { -- // JSProxy is always in slow-mode. -- DCHECK(!IsJSProxy(*target)); -+ IsJSObject(*target) && !IsJSGlobalProxy(*target)) { - // Convert to slow properties if we're guaranteed to overflow the number of - // descriptors. - int source_length;