mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 82.0.4076.1 * update patches * chore: bump chromium in DEPS to 82.0.4077.1 * update v8 patches * Remove deprecated wasm module type check https://chromium-review.googlesource.com/c/v8/v8/+/2033170 * chore: bump chromium in DEPS to 82.0.4078.0 * chore: bump chromium in DEPS to 82.0.4079.0 * chore: bump chromium in DEPS to 82.0.4080.0 * chore: bump chromium in DEPS to 82.0.4080.1 * chore: bump chromium in DEPS to 82.0.4081.2 * Update patches * chore: bump chromium in DEPS to 82.0.4082.1 * Remove cursor_types.h in favor of cursor_type.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2052103 (cherry picked from commit3b6e4d4a1a) * Refactor extensions report in management disclosure page https://chromium-review.googlesource.com/c/chromium/src/+/2038774 (cherry picked from commitb2ae06307d) * Rename an old referrer policy value https://chromium-review.googlesource.com/c/chromium/src/+/2082856 (cherry picked from commit3cb8af2515) * Fixup compiler errors * Move GLHelper to gpu:: https://chromium-review.googlesource.com/c/chromium/src/+/2023282 (cherry picked from commitea8e347088) * [api] Remove deprecated wasm module type check https://chromium-review.googlesource.com/c/v8/v8/+/2033170 (cherry picked from commit937988e6ce) * Replace blink::WebCursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1997138 (cherry picked from commit3e348c4d59) * DownloadURLParameters: Remove NetworkIsolationKey parameter. https://chromium-review.googlesource.com/c/chromium/src/+/2050987 (cherry picked from commit9b4aae745e) * Convert FrameHostMsg_UpdateFaviconURL to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2043181 (cherry picked from commit11b9c27eee) * Merge ui::ContextFactoryPrivate with ui::ContextFactory https://chromium-review.googlesource.com/c/chromium/src/+/2047728 (cherry picked from commit176876f243) * fix pdf viewer tests by binding more mojo things (cherry picked from commit74def418df) * chore: bump chromium in DEPS to 82.0.4083.1 * Update electron_swiftshader_binaries deps https://chromium-review.googlesource.com/c/chromium/src/+/2056931 (cherry picked from commit312f11129f) * Update patches * Use Promise with RequestPointerLock calls https://chromium-review.googlesource.com/c/chromium/src/+/2069199 (cherry picked from commit34350db4bd) * chore: bump chromium in DEPS to 82.0.4084.1 * Replace content::CursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1999201 (cherry picked from commit6b3b850692) * Convert MaterialDesignController to a true singleton. https://chromium-review.googlesource.com/c/chromium/src/+/2090877 (cherry picked from commit21ced9206d) * Drop WebContentsView::RenderViewCreated hook https://chromium-review.googlesource.com/c/chromium/src/+/2093535 (cherry picked from commit9ff4e65053) * Update patches * Splitting context_menu_params.h into separate browser VS common parts. https://chromium-review.googlesource.com/c/chromium/src/+/2097468 * Fix DCHECK on OnThemeChanged() https://chromium-review.googlesource.com/c/chromium/src/+/2090713 (cherry picked from commitfcec5f74d1) * chore: bump chromium in DEPS to 82.0.4085.1 * chore: bump chromium in DEPS to 82.0.4085.5 * chore: bump chromium in DEPS to 82.0.4085.7 * chore: bump chromium in DEPS to 82.0.4085.9 * Add debugging for TAB tests * update patches * fix: add patch to fix linux arm build (#22523) (cherry picked from commit479354e721) * chore: bump chromium in DEPS to 82.0.4085.10 * Check PointerLock requests for new options and update accordingly https://chromium-review.googlesource.com/c/chromium/src/+/2071788 * Update for changes from master roller review * FIXME: skip Menu.setApplicationMenu(null) test (cherry picked from commit305f167889) * Revert "Add debugging for TAB tests" This reverts commitaf393c1b0b. Co-authored-by: Jeremy Apthorp <jeremya@chromium.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
84 lines
4.0 KiB
Diff
84 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:44:26 -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 and correspondingly in gin.
|
|
|
|
diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
|
|
index b94a71ef856f92404e16544e22ebbadf57cff363..b15685f6907bcafeb1acd62bfe76f0713dea27f3 100644
|
|
--- a/gin/array_buffer.cc
|
|
+++ b/gin/array_buffer.cc
|
|
@@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
|
|
return malloc(length);
|
|
}
|
|
|
|
+void* ArrayBufferAllocator::Realloc(void* data, size_t length) {
|
|
+ return realloc(data, length);
|
|
+}
|
|
+
|
|
void ArrayBufferAllocator::Free(void* data, size_t length) {
|
|
free(data);
|
|
}
|
|
diff --git a/gin/array_buffer.h b/gin/array_buffer.h
|
|
index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f4ddb2de2 100644
|
|
--- a/gin/array_buffer.h
|
|
+++ b/gin/array_buffer.h
|
|
@@ -21,6 +21,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
|
|
public:
|
|
void* Allocate(size_t length) override;
|
|
void* AllocateUninitialized(size_t length) override;
|
|
+ void* Realloc(void* data, size_t length) override;
|
|
void Free(void* data, size_t length) override;
|
|
|
|
GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
|
|
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
index 696a6170a584c1bb71c8ad253963d9f64395a13e..9677aa931cd543adfc1e9844d6afee8dcb0f4c2d 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
@@ -661,6 +661,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
|
|
size, ArrayBufferContents::kDontInitialize);
|
|
}
|
|
|
|
+ void* Realloc(void* data, size_t size) override {
|
|
+ return ArrayBufferContents::Realloc(data, size);
|
|
+ }
|
|
+
|
|
void Free(void* data, size_t size) override {
|
|
ArrayBufferContents::FreeMemory(data);
|
|
}
|
|
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
|
|
index 095ca3db051362319611976b9052725ab16c1b3a..13e802a5732f0b04832d6dd8031ae43e1240b79a 100644
|
|
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
|
|
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
|
|
@@ -126,6 +126,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
|
|
return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull);
|
|
}
|
|
|
|
+void* ArrayBufferContents::Realloc(void* data, size_t size) {
|
|
+ return WTF::Partitions::ArrayBufferPartition()->Realloc(data, size,
|
|
+ WTF_HEAP_PROFILER_TYPE_NAME(ArrayBufferContents));
|
|
+}
|
|
+
|
|
void ArrayBufferContents::FreeMemory(void* data) {
|
|
WTF::Partitions::ArrayBufferPartition()->Free(data);
|
|
}
|
|
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
|
|
index 2e871b20c1e6fc3703178957fd03923f02ab1b47..8f2fd80130f1e7f957d642af4e5c22f9a5937ce4 100644
|
|
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
|
|
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
|
|
@@ -106,6 +106,7 @@ class CORE_EXPORT ArrayBufferContents {
|
|
void CopyTo(ArrayBufferContents& other);
|
|
|
|
static void* AllocateMemoryOrNull(size_t, InitializationPolicy);
|
|
+ static void* Realloc(void* data, size_t);
|
|
static void FreeMemory(void*);
|
|
|
|
private:
|