mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 520c02b46668fc608927e0fcd79b6a90885a48bf
* chore: bump chromium in DEPS to 90.0.4414.0
* resolve chromium conflicts
* resolve v8 conflicts
* fix node gn files
* 2673502: Remove RenderViewCreated use from ExtensionHost.
https://chromium-review.googlesource.com/c/chromium/src/+/2673502
* 2676903: [mojo] Remove most legacy Binding classes.
https://chromium-review.googlesource.com/c/chromium/src/+/2676903
* 2644847: Move self-deleting URLLoaderFactory base into //services/network.
https://chromium-review.googlesource.com/c/chromium/src/+/2644847
* 2664006: Remove from mojo::DataPipe.
https://chromium-review.googlesource.com/c/chromium/src/+/2664006
* 2674530: Remove CertVerifierService feature
https://chromium-review.googlesource.com/c/chromium/src/+/2674530
* 2668748: Move OnSSLCertificateError to a new interface.
https://chromium-review.googlesource.com/c/chromium/src/+/2668748
* 2672923: Remove RAPPOR reporting infrastructure.
https://chromium-review.googlesource.com/c/chromium/src/+/2672923
* 2673502: Remove RenderViewCreated use from ExtensionHost.
https://chromium-review.googlesource.com/c/chromium/src/+/2673502
* 2655126: Convert FrameHostMsg_ContextMenu and FrameMsg_ContextMenuClosed|CustomContextMenuAction to Mojo
https://chromium-review.googlesource.com/c/chromium/src/+/2655126
* 2628705: Window Placement: Implement screen.isExtended and change event
https://chromium-review.googlesource.com/c/chromium/src/+/2628705
* 2643161: Refactor storage::kFileSystem*Native*
https://chromium-review.googlesource.com/c/chromium/src/+/2643161
* fix build
* only remove the biggest subdir of //ios
* chore: bump chromium in DEPS to 90.0.4415.0
* update patches
* update sysroots
* 2686147: Remove WebContentsObserver::RenderViewCreated().
https://chromium-review.googlesource.com/c/chromium/src/+/2686147
* 2596429: Fixing how extension's split and spanning modes affect OriginAccessList.
https://chromium-review.googlesource.com/c/chromium/src/+/2596429
* 2686026: [mojo] Delete AssociatedInterfacePtr (replaced by AssociatedRemote)
https://chromium-review.googlesource.com/c/chromium/src/+/2686026
* 2651705: Move ui/base/dragdrop/file_info to ui/base/clipboard
https://chromium-review.googlesource.com/c/chromium/src/+/2651705
* 358217: drawBitmap is deprecated
https://skia-review.googlesource.com/c/skia/+/358217
* fix gn check
* 2678098: Use gen/front_end as input to generate_devtools_grd
https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2678098
* 2674530: Remove CertVerifierService feature
https://chromium-review.googlesource.com/c/chromium/src/+/2674530
* fixup 2664006: Remove from mojo::DataPipe.
https://chromium-review.googlesource.com/c/chromium/src/+/2664006
* fixup build_add_electron_tracing_category.patch
* 2673415: [base] Prepare CrashReporterClient for string16 switch
https://chromium-review.googlesource.com/c/chromium/src/+/2673415
* 2673413: Add CursorFactoryWin to handle Cursors on Windows
https://chromium-review.googlesource.com/c/chromium/src/+/2673413
* 2668748: Move OnSSLCertificateError to a new interface.
https://chromium-review.googlesource.com/c/chromium/src/+/2668748
* fix mas gn check
* update patch after merge
* Update node for .mjs files
* build: load v8_prof_processor dependencies as ESM
* chore: add patch to fix linux 32bit
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
(cherry picked from commit ca75bca667)
Co-authored-by: Electron Bot <electron@github.com>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 22 Oct 2018 10:47:11 -0700
|
|
Subject: add_realloc.patch
|
|
|
|
Blink overrides ArrayBuffer's allocator with its own one, while Node simply
|
|
uses malloc and free, so we need to use v8's allocator in Node. As part of the
|
|
10.6.0 upgrade, we needed to make SerializerDelegate accept an allocator
|
|
argument in its constructor, and override ReallocateBufferMemory and
|
|
FreeBufferMemory to use the allocator. We cannot simply allocate and then memcpy
|
|
when we override ReallocateBufferMemory, so we therefore need to implement
|
|
Realloc on the v8 side.
|
|
|
|
diff --git a/include/v8.h b/include/v8.h
|
|
index 63bd969ed6f83f8728a2cbb4479e269d1e3ffbc0..0d79c72077d05c69312d527b0e23b68f85a7cfd7 100644
|
|
--- a/include/v8.h
|
|
+++ b/include/v8.h
|
|
@@ -5295,6 +5295,13 @@ class V8_EXPORT ArrayBuffer : public Object {
|
|
*/
|
|
virtual void* AllocateUninitialized(size_t length) = 0;
|
|
|
|
+ /**
|
|
+ * Free the memory block of size |length|, pointed to by |data|.
|
|
+ * That memory must be previously allocated by |Allocate| and not yet freed
|
|
+ * with a call to |Free| or |Realloc|
|
|
+ */
|
|
+ virtual void* Realloc(void* data, size_t length);
|
|
+
|
|
/**
|
|
* Free the memory block of size |length|, pointed to by |data|.
|
|
* That memory is guaranteed to be previously allocated by |Allocate|.
|
|
diff --git a/src/api/api.cc b/src/api/api.cc
|
|
index 1107b70b672d783b479a28f7a66afb10959e41d8..3e00ce21aeba97372b0b849ecc47e1e9a5b3c804 100644
|
|
--- a/src/api/api.cc
|
|
+++ b/src/api/api.cc
|
|
@@ -313,6 +313,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {
|
|
i::V8::SetSnapshotBlob(snapshot_blob);
|
|
}
|
|
|
|
+void* v8::ArrayBuffer::Allocator::Realloc(void* data, size_t length) {
|
|
+ UNIMPLEMENTED();
|
|
+}
|
|
+
|
|
namespace {
|
|
|
|
class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
|