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>
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 73435b1c2c008a376421f8c94059fdb61d58feed..9ded78a8fd05bf4278c9800fcd0cdea6cefa2ac8 100644
|
|
--- a/gin/isolate_holder.cc
|
|
+++ b/gin/isolate_holder.cc
|
|
@@ -105,9 +105,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 ac74939f36630673c4ee9db02bef320f17c86154..3dd0f2be0be9ac5194523333aa0d822eaa9eb814 100644
|
|
--- a/gin/v8_initializer.cc
|
|
+++ b/gin/v8_initializer.cc
|
|
@@ -198,12 +198,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
|