mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -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>
75 lines
3.2 KiB
Diff
75 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:47:44 -0700
|
|
Subject: gin_enable_disable_v8_platform.patch
|
|
|
|
We don't use gin to create the V8 platform, because we need to inject Node
|
|
things.
|
|
|
|
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
|
|
index ee74e6ea92c64d0e95a4988557b236667f5b7e42..c3ae4c6221686479d05800c51d17d581c095e397 100644
|
|
--- a/gin/isolate_holder.cc
|
|
+++ b/gin/isolate_holder.cc
|
|
@@ -103,9 +103,10 @@ IsolateHolder::~IsolateHolder() {
|
|
// static
|
|
void IsolateHolder::Initialize(ScriptMode mode,
|
|
v8::ArrayBuffer::Allocator* allocator,
|
|
- const intptr_t* reference_table) {
|
|
+ const intptr_t* reference_table,
|
|
+ bool create_v8_platform) {
|
|
CHECK(allocator);
|
|
- V8Initializer::Initialize(mode);
|
|
+ V8Initializer::Initialize(mode, create_v8_platform);
|
|
g_array_buffer_allocator = allocator;
|
|
g_reference_table = reference_table;
|
|
}
|
|
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
|
|
index f23af2d9738f3aa76e3a49301e1c3216ee4a64b4..ede178acabc63c3c33d6ce93efd5632bec50ba89 100644
|
|
--- a/gin/public/isolate_holder.h
|
|
+++ b/gin/public/isolate_holder.h
|
|
@@ -88,7 +88,8 @@ class GIN_EXPORT IsolateHolder {
|
|
// reference pointers. Otherwise, it can be nullptr.
|
|
static void Initialize(ScriptMode mode,
|
|
v8::ArrayBuffer::Allocator* allocator,
|
|
- const intptr_t* reference_table = nullptr);
|
|
+ const intptr_t* reference_table = nullptr,
|
|
+ bool create_v8_platform = true);
|
|
|
|
v8::Isolate* isolate() { return isolate_; }
|
|
|
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
|
index 3a3742ed911cf49b6c93d02763d6eaa9554df62b..c53ea98d3897675c18c1eb8ad37dbce61110fa2e 100644
|
|
--- a/gin/v8_initializer.cc
|
|
+++ b/gin/v8_initializer.cc
|
|
@@ -190,12 +190,14 @@ enum LoadV8FileResult {
|
|
} // namespace
|
|
|
|
// static
|
|
-void V8Initializer::Initialize(IsolateHolder::ScriptMode mode) {
|
|
+void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
+ bool create_v8_platform) {
|
|
static bool v8_is_initialized = false;
|
|
if (v8_is_initialized)
|
|
return;
|
|
|
|
- v8::V8::InitializePlatform(V8Platform::Get());
|
|
+ if (create_v8_platform)
|
|
+ v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
if (!base::FeatureList::IsEnabled(features::kV8OptimizeJavascript)) {
|
|
// We avoid explicitly passing --opt if kV8OptimizeJavascript is enabled
|
|
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
|
|
index 2918c6235688ee4eb7c43387296e6d24145c14aa..069c2c96d5067f0444dac3c6ce6d83f75e770129 100644
|
|
--- a/gin/v8_initializer.h
|
|
+++ b/gin/v8_initializer.h
|
|
@@ -20,7 +20,8 @@ namespace gin {
|
|
class GIN_EXPORT V8Initializer {
|
|
public:
|
|
// This should be called by IsolateHolder::Initialize().
|
|
- static void Initialize(IsolateHolder::ScriptMode mode);
|
|
+ static void Initialize(IsolateHolder::ScriptMode mode,
|
|
+ bool create_v8_platform = true);
|
|
|
|
// Get address and size information for currently loaded snapshot.
|
|
// If no snapshot is loaded, the return values are null for addresses
|