chore: bump chromium to 129.0.6630.0 (main) (#43087)
* chore: bump chromium in DEPS to 129.0.6623.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch remove the changes to media/audio/mac/audio_manager_mac.cc, since upstream has also made this change now. Xref:5738654
* chore: update fix_disable_scope_reuse_associated_dchecks.patch We had been removing a couple of `DCHECK`. Upstream changed their code to limit when these `DCHECK`s get called, so let's see if our change is still needed. Xref:5739076
* chore: e patches all * Bump the Chrome macOS deployment target to 11.0 Xref:5734361
BREAKING CHANGE: Bump the Chrome macOS deployment target to 11.0 * src: stop using deprecated fields of `v8::FastApiCallbackOptions` Xref:d0000b118d
Xref:5741336
Xref:5741199
* fixup! chore: update fix_disable_scope_reuse_associated_dchecks.patch chore: re-disable DCHECKs yep, it is still needed * refactor use non-deprecated variant of openApplicationAtURL old version is deprecated now in macOS 11 Xref:1534810
-launchapplicationaturl Xref:3172700
-openapplicationaturl * chore: bump chromium in DEPS to 129.0.6626.0 * chore: e patches all * chore: disable NSUserNotification deprecation errors * chore: disable NSWindowStyleMaskTexturedBackground deprecation errors Xref: https://github.com/electron/electron/issues/43125 * chore: disable deprecation errors in platform_util_mac.mm * chore: disable launchApplication deprecation errors * chore: bump chromium in DEPS to 129.0.6630.0 * chore: update refactor_expose_file_system_access_blocklist.patch apply patch manually due to context shear Xref:5745444
* chore: update deps_add_v8_object_setinternalfieldfornodecore.patch no manual changes. patch applied with fuzz 1 (offset -5 lines) * chore: e patches all * fix: add clang_x64_v8_arm64/snapshot_blob.bin to the zip manifest Xref:5746173
--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
This commit is contained in:
parent
7c79221a54
commit
5b18cc46bc
75 changed files with 410 additions and 234 deletions
|
@ -54,3 +54,4 @@ fix_add_property_query_interceptors.patch
|
|||
src_account_for_openssl_unexpected_version.patch
|
||||
windows_32bit_config_change_callback_needs_to_be_stdcall.patch
|
||||
fix_building_with_unicode.patch
|
||||
src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Haas <ahaas@chromium.org>
|
||||
Date: Sun, 28 Jul 2024 09:20:12 +0200
|
||||
Subject: src: stop using deprecated fields of `v8::FastApiCallbackOptions`
|
||||
|
||||
Two fields on the `v8::FastApiCallbackOptions` struct were deprecated
|
||||
recently: `fallback` and `wasm_memory`. This PR removes uses of these
|
||||
two fields in node.js.
|
||||
|
||||
(This is a subset of upstream commit d0000b118 from the `canary-base`
|
||||
branch of Node.js. This patch can be removed when Electron upgrades to
|
||||
a stable Node release that contains the change. -- Charles)
|
||||
|
||||
diff --git a/src/histogram.cc b/src/histogram.cc
|
||||
index 4f58359fe58529329fca8b13d4d4655d87a097f2..18983209db834d10faad6c2a56658ab060bcd097 100644
|
||||
--- a/src/histogram.cc
|
||||
+++ b/src/histogram.cc
|
||||
@@ -193,7 +193,8 @@ void HistogramBase::FastRecord(Local<Value> receiver,
|
||||
const int64_t value,
|
||||
FastApiCallbackOptions& options) {
|
||||
if (value < 1) {
|
||||
- options.fallback = true;
|
||||
+ Environment* env = Environment::GetCurrent(options.isolate);
|
||||
+ THROW_ERR_OUT_OF_RANGE(env, "value is out of range");
|
||||
return;
|
||||
}
|
||||
HistogramBase* histogram;
|
||||
diff --git a/src/node_wasi.cc b/src/node_wasi.cc
|
||||
index ad1da44a01f437c97e06a3857eebd2edcebc83da..7123278e1a0942b61a76e9b1e7464eb8b5064079 100644
|
||||
--- a/src/node_wasi.cc
|
||||
+++ b/src/node_wasi.cc
|
||||
@@ -248,17 +248,18 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback(
|
||||
WASI* wasi = reinterpret_cast<WASI*>(BaseObject::FromJSObject(receiver));
|
||||
if (UNLIKELY(wasi == nullptr)) return EinvalError<R>();
|
||||
|
||||
- if (UNLIKELY(options.wasm_memory == nullptr || wasi->memory_.IsEmpty())) {
|
||||
- // fallback to slow path which to throw an error about missing memory.
|
||||
- options.fallback = true;
|
||||
+ v8::Isolate* isolate = receiver->GetIsolate();
|
||||
+ v8::HandleScope handle_scope(isolate);
|
||||
+ if (wasi->memory_.IsEmpty()) {
|
||||
+ THROW_ERR_WASI_NOT_STARTED(isolate);
|
||||
return EinvalError<R>();
|
||||
}
|
||||
- uint8_t* memory = nullptr;
|
||||
- CHECK(LIKELY(options.wasm_memory->getStorageIfAligned(&memory)));
|
||||
+ Local<ArrayBuffer> ab = wasi->memory_.Get(isolate)->Buffer();
|
||||
+ size_t mem_size = ab->ByteLength();
|
||||
+ char* mem_data = static_cast<char*>(ab->Data());
|
||||
+ CHECK_NOT_NULL(mem_data);
|
||||
|
||||
- return F(*wasi,
|
||||
- {reinterpret_cast<char*>(memory), options.wasm_memory->length()},
|
||||
- args...);
|
||||
+ return F(*wasi, {mem_data, mem_size}, args...);
|
||||
}
|
||||
|
||||
namespace {
|
Loading…
Add table
Add a link
Reference in a new issue