8a8241163d
* chore: bump chromium in DEPS to 127.0.6526.0 * chore: update network_service_allow_remote_certificate_verification_logic.patch manually apply patch due to minor upstream shear Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5598454 * chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch No manual changes; patch applied with fuzz 1 * chore: update refactor_expose_file_system_access_blocklist.patch No manual changes; patch applied with fuzz 2 * chore: update revert_heap_add_checks_position_info.patch No manual changes; patch applied with fuzz 1 * chore: e patches all * chore: bump chromium in DEPS to 127.0.6527.0 * chore: update patches * chore: bump chromium in DEPS to 127.0.6529.0 * chore: bump chromium in DEPS to 127.0.6531.0 * chore: update patches * 5596349: Remove PDF OCR toggle from settings. https://chromium-review.googlesource.com/c/chromium/src/+/5596349 * 5585932: [video-pip] Add minimize button to video picture-in-picture window https://chromium-review.googlesource.com/c/chromium/src/+/5585932 * 5604487: Reland "[api] Deprecate v8::FunctionCallbackInfo::Holder() for real" https://chromium-review.googlesource.com/c/v8/v8/+/5604487 * 5581721: [DEPS] Update clang-format location https://chromium-review.googlesource.com/c/chromium/src/+/5581721 * 5597904: [Windows] Remove ConvertToLongPath from Sandbox Utilities. https://chromium-review.googlesource.com/c/chromium/src/+/5597904 ResolveNTFunctionPtr was removed in this CL. * fix: visibility state specs on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/5605407 * Revert "fix: visibility state specs on macOS" This reverts commit 1eee30a33dfafeec86cdd09526a07b01abca2ed6. * temp: disable occlusion checker on macOS * chore: bump chromium in DEPS to 128.0.6535.0 * chore: update patches * [Extensions] Move some scriptings files out of the API directory. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5606682 * fix[node]: do not use soon-to-be-deprecated V8 API * fix: update api_remove_allcan_read_write.patch * chore: update patches * chore: update patches * chore: fix lf mismatch in api_remove_allcan_read_write.patch * chore: update patches * chore: bump chromium in DEPS to 128.0.6538.0 * chore: update v8 patches * chore: update patches * ui/gl/features.gni: Set use_egl=true unconditionally. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5569748 Refs https://issues.chromium.org/issues/344606399 * chore: bump chromium in DEPS to 128.0.6540.0 * chore: bump chromium in DEPS to 128.0.6541.0 * chore: update patches * chore: fix nan read/write patch * chore: bump chromium in DEPS to 128.0.6543.0 * 5626254: Use sandbox_type instead of process_type | https://chromium-review.googlesource.com/c/chromium/src/+/5626254 * chore: update patches * rework nan patches * 5621488: Apply consistent naming conventions to zoom values | https://chromium-review.googlesource.com/c/chromium/src/+/5621488 * chore: bump chromium in DEPS to 128.0.6544.0 * 5605693: Remove files from third_party/ninja | https://chromium-review.googlesource.com/c/chromium/src/+/5605693 * chore: update patches * chore: maybe fix nan patch, part 3 * chore: delete nan patch * chore: re-add nan patch (attempt 2) * chore: add test patch * fixup! add test patch * chore: bump chromium in DEPS to 128.0.6549.0 * chore: bump chromium in DEPS to 128.0.6551.0 * 5637699: Add command line to ASAN Additional Info section | https://chromium-review.googlesource.com/c/chromium/src/+/5637699 * chore: update patches * chore: bump chromium in DEPS to 128.0.6553.0 * chore: bump chromium in DEPS to 128.0.6555.0 * fix: add property query interceptors * chore: bump chromium in DEPS to 128.0.6557.0 * 5583182: Automatic Fullscreen: Prototype Permissions API query support | https://chromium-review.googlesource.com/c/chromium/src/+/5583182 * 5613297: Move render input router and related dependencies to //components/input | https://chromium-review.googlesource.com/c/chromium/src/+/5613297 * chore: update patches * test: skip methodswithdata-test.js nan test * chore: bump chromium in DEPS to 128.0.6558.0 * chore: update patches * build: reference correct ninja cipd ref Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5605693 * update libcxx filenames * refactor: CursorManager moved to //components/input Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5613297 * refactor: spanify mojo Read/WriteData methods Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5619291 * refactor: remove constexpr from KeyboardCodeFromKeyIdentifier Ref: unknown Added TODO to investigate after * chore: update patches * refactor: improve type safety of a11y ids Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5614590 * chore: disable tls node tests that don't apply given boringssl tls configuration Ref: https://boringssl-review.googlesource.com/c/boringssl/+/68487 * chore: add patch to fix nan v8 incompat with NamedPropertyHandlerConfiguration and IndexedPropertyHandlerConfiguration Ref: https://chromium-review.googlesource.com/c/v8/v8/+/5630388 * fix: limit subspan length per feedback * Fix incorrect CalculateInsetsInDIP check * 5645742: Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al"" https://chromium-review.googlesource.com/c/chromium/src/+/5645742 * chore: more Windows logging * 5617471: Add NPU blocking to chromium blocklist https://chromium-review.googlesource.com/c/chromium/src/+/5617471 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Alice Zhao <alice@makenotion.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
141 lines
4.1 KiB
Diff
141 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Keeley Hammond <khammond@slack-corp.com>
|
|
Date: Thu, 20 Jun 2024 14:42:08 -0700
|
|
Subject: Check for NODE_21_0_MODULE_VERSION
|
|
|
|
Refs https://chromium-review.googlesource.com/c/v8/v8/+/5006387
|
|
Should be upstreamed.
|
|
|
|
Module version checks are made against 119 since that is the current assigned version
|
|
for Electron 28 in https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json.
|
|
The version should be updateed to the one assinged for Electron 29 when it is available.
|
|
|
|
Steps for upstreaming this patch:
|
|
|
|
- Get a new module version assigned for Electron 29 in nodejs/node
|
|
- Update NODE_21_0_MODULE_VERSION to the new version number
|
|
- Upstream patch to nodejs/nan before Electron 29 is branched
|
|
|
|
diff --git a/nan.h b/nan.h
|
|
index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcbfa58bbca 100644
|
|
--- a/nan.h
|
|
+++ b/nan.h
|
|
@@ -47,6 +47,7 @@
|
|
#define NODE_18_0_MODULE_VERSION 108
|
|
#define NODE_19_0_MODULE_VERSION 111
|
|
#define NODE_20_0_MODULE_VERSION 115
|
|
+#define NODE_21_0_MODULE_VERSION 119
|
|
|
|
#ifdef _MSC_VER
|
|
# define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800)
|
|
@@ -2525,7 +2526,9 @@ NAN_DEPRECATED inline void SetAccessor(
|
|
, GetterCallback getter
|
|
, SetterCallback setter
|
|
, v8::Local<v8::Value> data
|
|
+#if (NODE_MODULE_VERSION < NODE_21_0_MODULE_VERSION)
|
|
, v8::AccessControl settings
|
|
+#endif
|
|
, v8::PropertyAttribute attribute
|
|
, imp::Sig signature) {
|
|
HandleScope scope;
|
|
@@ -2553,17 +2556,28 @@ NAN_DEPRECATED inline void SetAccessor(
|
|
obj->SetInternalField(imp::kDataIndex, data);
|
|
}
|
|
|
|
+#if (NODE_MODULE_VERSION >= NODE_21_0_MODULE_VERSION)
|
|
+ tpl->SetNativeDataProperty(
|
|
+ name
|
|
+ , getter_
|
|
+ , setter_
|
|
+ , obj
|
|
+ , attribute);
|
|
+#else
|
|
tpl->SetAccessor(
|
|
name
|
|
, getter_
|
|
, setter_
|
|
, obj
|
|
+#if (NODE_MODULE_VERSION < NODE_21_0_MODULE_VERSION)
|
|
, settings
|
|
+#endif
|
|
, attribute
|
|
#if (NODE_MODULE_VERSION < NODE_16_0_MODULE_VERSION)
|
|
, signature
|
|
#endif
|
|
);
|
|
+#endif
|
|
}
|
|
|
|
inline void SetAccessor(
|
|
@@ -2572,7 +2586,9 @@ inline void SetAccessor(
|
|
, GetterCallback getter
|
|
, SetterCallback setter = 0
|
|
, v8::Local<v8::Value> data = v8::Local<v8::Value>()
|
|
+#if (NODE_MODULE_VERSION < NODE_21_0_MODULE_VERSION)
|
|
, v8::AccessControl settings = v8::DEFAULT
|
|
+#endif
|
|
, v8::PropertyAttribute attribute = v8::None) {
|
|
HandleScope scope;
|
|
|
|
@@ -2599,14 +2615,25 @@ inline void SetAccessor(
|
|
obj->SetInternalField(imp::kDataIndex, data);
|
|
}
|
|
|
|
+#if (NODE_MODULE_VERSION >= NODE_21_0_MODULE_VERSION)
|
|
+ tpl->SetNativeDataProperty(
|
|
+ name
|
|
+ , getter_
|
|
+ , setter_
|
|
+ , obj
|
|
+ , attribute);
|
|
+#else
|
|
tpl->SetAccessor(
|
|
name
|
|
, getter_
|
|
, setter_
|
|
, obj
|
|
+#if (NODE_MODULE_VERSION < NODE_21_0_MODULE_VERSION)
|
|
, settings
|
|
+#endif
|
|
, attribute
|
|
);
|
|
+#endif
|
|
}
|
|
|
|
inline bool SetAccessor(
|
|
@@ -2642,7 +2669,15 @@ inline bool SetAccessor(
|
|
, New<v8::External>(reinterpret_cast<void *>(setter)));
|
|
}
|
|
|
|
-#if (NODE_MODULE_VERSION >= NODE_6_0_MODULE_VERSION)
|
|
+#if (NODE_MODULE_VERSION >= NODE_21_0_MODULE_VERSION)
|
|
+ return obj->SetNativeDataProperty(
|
|
+ GetCurrentContext()
|
|
+ , name
|
|
+ , getter_
|
|
+ , setter_
|
|
+ , dataobj
|
|
+ , attribute).FromMaybe(false);
|
|
+#elif (NODE_MODULE_VERSION >= NODE_6_0_MODULE_VERSION)
|
|
return obj->SetAccessor(
|
|
GetCurrentContext()
|
|
, name
|
|
diff --git a/test/js/accessors-test.js b/test/js/accessors-test.js
|
|
index e6ad45737e2ac18da3fa936b1de618e7389933bc..025f5b66774c2f5fe0ccb98c91fc714dd916fcb1 100644
|
|
--- a/test/js/accessors-test.js
|
|
+++ b/test/js/accessors-test.js
|
|
@@ -11,7 +11,7 @@ const test = require('tap').test
|
|
, bindings = require('bindings')({ module_root: testRoot, bindings: 'accessors' });
|
|
|
|
test('accessors', function (t) {
|
|
- t.plan(7)
|
|
+ t.plan(6)
|
|
var settergetter = bindings.create()
|
|
t.equal(settergetter.prop1, 'this is property 1')
|
|
t.ok(settergetter.prop2 === '')
|
|
@@ -28,5 +28,4 @@ test('accessors', function (t) {
|
|
t.equal(derived.prop1, 'this is property 1')
|
|
derived.prop2 = 'setting a new value'
|
|
t.equal(derived.prop2, 'setting a new value')
|
|
- t.equal(settergetter.prop2, 'setting a new value')
|
|
})
|