mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
44adc8ddb4
* chore: bump chromium in DEPS to 89.0.4389.47 * chore: bump chromium in DEPS to 89.0.4389.58 * update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 e9235d17955089433ef27d3d10c1b5994862b550..d89a5bbed03d8782885b7b9c69d1513c03b1de76 100644
|
|
--- a/include/v8.h
|
|
+++ b/include/v8.h
|
|
@@ -5275,6 +5275,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 9b19d155bd80c4df641713cf8891ca916497bc25..c9f15567632b08b6e334d17ad40b5758876a40c2 100644
|
|
--- a/src/api/api.cc
|
|
+++ b/src/api/api.cc
|
|
@@ -545,6 +545,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 {
|