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 <jkleinsc@electronjs.org>
This commit is contained in:
parent
1872411ae8
commit
526e2f8916
4 changed files with 2 additions and 30 deletions
|
@ -56,7 +56,7 @@ executors:
|
||||||
# 2xlarge should not be used directly, use the pipeline param instead
|
# 2xlarge should not be used directly, use the pipeline param instead
|
||||||
enum: ["medium", "electronjs/aks-linux-medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"]
|
enum: ["medium", "electronjs/aks-linux-medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"]
|
||||||
docker:
|
docker:
|
||||||
- image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
|
- image: ghcr.io/electron/build:9a43c14f5c19be0359843299f79e736521373adc
|
||||||
resource_class: << parameters.size >>
|
resource_class: << parameters.size >>
|
||||||
|
|
||||||
macos:
|
macos:
|
||||||
|
|
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'124.0.6367.201',
|
'124.0.6367.207',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v20.11.1',
|
'v20.11.1',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
chore_allow_customizing_microtask_policy_per_context.patch
|
chore_allow_customizing_microtask_policy_per_context.patch
|
||||||
deps_add_v8_object_setinternalfieldfornodecore.patch
|
deps_add_v8_object_setinternalfieldfornodecore.patch
|
||||||
cherry-pick-f320600cd1f4.patch
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Shu-yu Guo <syg@chromium.org>
|
|
||||||
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 <rezvan@chromium.org>
|
|
||||||
Commit-Queue: Shu-yu Guo <syg@chromium.org>
|
|
||||||
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<bool> JSReceiver::SetOrCopyDataProperties(
|
|
||||||
Nothing<bool>());
|
|
||||||
|
|
||||||
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;
|
|
Loading…
Reference in a new issue