8acf6039e7
* chore: bump chromium in DEPS to 110.0.5425.0 * chore: bump chromium in DEPS to 110.0.5427.0 * chore: bump chromium in DEPS to 110.0.5429.0 * chore: bump chromium in DEPS to 110.0.5431.0 * chore: update patches/chromium/picture-in-picture.patch to fix upstream code shear https://chromium-review.googlesource.com/c/chromium/src/+/4024078 * chore: sync patch w/upstream shear: remove_usage_of_incognito_apis_in_the_spellchecker.patch https://chromium-review.googlesource.com/c/chromium/src/+/3967854 * chore: sync patch w/upstream shear: feat_expose_raw_response_headers_from_urlloader.patch https://chromium-review.googlesource.com/c/chromium/src/+/3983373 * chore: sync patch w/upstream shear: chromium/custom_protocols_plzserviceworker.patch https://chromium-review.googlesource.com/c/chromium/src/+/3983373 * build: update references to core_api_provider; its location was moved upstream Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4006696 * build: remove back_to_tab_image_button from our enable_picture_in_picture deps Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4024078 back_to_tab_image_button has been removed upstream * chore: update patches * chore: bump chromium in DEPS to 110.0.5433.0 * chore: sync patch w/upstream shear: chromium/printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4006638 * chore: sync patch w/trivial upstream shear: chromium/process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4031817 * refactor: remove kAutofillCenterAlignedSuggestions feature flag check. This behavior had been an experiment behind a feature flag. The experiment was a success so the feature was kept & the flag was removed. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3870616 moves from disabled-by-default to enabled-by-default Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4030556 removed the feature flag * chore: update patches * chore: bump chromium in DEPS to 110.0.5435.0 * chore: update patches * chore: sync code with upstream change: AXLMode method name Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3950054 * 3841761: Adapting code to support kSystemProfileSelectionDefaultNone experiment https://chromium-review.googlesource.com/c/chromium/src/+/3841761 * chore: bump chromium in DEPS to 110.0.5437.0 * 4040140: Pip 2.0: Merge VideoOverlayWindowViews and OverlayWindowViews https://chromium-review.googlesource.com/c/chromium/src/+/4040140 * 4045567: Fix a crash opening a popup from tab capture fullscreen https://chromium-review.googlesource.com/c/chromium/src/+/4045567 * chore: fixup patch indices * 4048263: Remove deprecated Value calls in frame_tracker_unittest.cc. https://chromium-review.googlesource.com/c/chromium/src/+/4048263 * 4004606: [intl] Migrate to ICU 72 https://chromium-review.googlesource.com/c/v8/v8/+/4004606 * chore: bump chromium in DEPS to 110.0.5439.0 * 3890670: Prerender: Add first implementation of prerender-in-new-tab mode https://chromium-review.googlesource.com/c/chromium/src/+/3890670 * chore: fixup patch indices * chore: bump chromium in DEPS to 110.0.5441.0 * chore: update patches * chore: bump chromium in DEPS to 110.0.5443.0 * 4035451: Remove remaining uses of ScopedNestableTaskAllower. https://chromium-review.googlesource.com/c/chromium/src/+/4035451 * chore: bump chromium in DEPS to 110.0.5445.0 * chore: update patches * fixup! 3890670: Prerender: Add first implementation of prerender-in-new-tab mode * test: disable parallel/test-worker-init-failure Refs https://chromium-review.googlesource.com/c/v8/v8/+/4017512 Refs https://github.com/nodejs/node-v8/issues/246 * chore: disable parallel/test-fetch Test is flaky on Linux CI, but runs fine locally. * chore: bump chromium in DEPS to 110.0.5451.0 * chore: update patches * chore: cleanup patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: electron-patch-conflict-fixer[bot] <83340002+electron-patch-conflict-fixer[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
77 lines
4 KiB
Diff
77 lines
4 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 a82c7d1189b35223647f5de46ed415302f269827..c74b81af691aee95609913519e36498ec578620a 100644
|
|
--- a/gin/isolate_holder.cc
|
|
+++ b/gin/isolate_holder.cc
|
|
@@ -137,9 +137,10 @@ void IsolateHolder::Initialize(ScriptMode mode,
|
|
const intptr_t* reference_table,
|
|
const std::string js_command_line_flags,
|
|
v8::FatalErrorCallback fatal_error_callback,
|
|
- v8::OOMErrorCallback oom_error_callback) {
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
|
+ bool create_v8_platform) {
|
|
CHECK(allocator);
|
|
- V8Initializer::Initialize(mode, js_command_line_flags, oom_error_callback);
|
|
+ V8Initializer::Initialize(mode, js_command_line_flags, oom_error_callback, create_v8_platform);
|
|
g_array_buffer_allocator = allocator;
|
|
g_reference_table = reference_table;
|
|
g_fatal_error_callback = fatal_error_callback;
|
|
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
|
|
index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb24970337a50f 100644
|
|
--- a/gin/public/isolate_holder.h
|
|
+++ b/gin/public/isolate_holder.h
|
|
@@ -109,7 +109,8 @@ class GIN_EXPORT IsolateHolder {
|
|
const intptr_t* reference_table = nullptr,
|
|
const std::string js_command_line_flags = {},
|
|
v8::FatalErrorCallback fatal_error_callback = nullptr,
|
|
- v8::OOMErrorCallback oom_error_callback = nullptr);
|
|
+ v8::OOMErrorCallback oom_error_callback = nullptr,
|
|
+ bool create_v8_platform = true);
|
|
|
|
// Returns whether `Initialize` has already been invoked in the process.
|
|
// Initialization is a one-way operation (i.e., this method cannot return
|
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
|
index 10b8bfab658830bc65447a84b2a98d40b9c48a63..70ae158b8f8ffbcbd559dffb025e6fb1e76f8ff0 100644
|
|
--- a/gin/v8_initializer.cc
|
|
+++ b/gin/v8_initializer.cc
|
|
@@ -373,7 +373,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
|
|
// static
|
|
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
const std::string js_command_line_flags,
|
|
- v8::OOMErrorCallback oom_error_callback) {
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
|
+ bool create_v8_platform) {
|
|
static bool v8_is_initialized = false;
|
|
if (v8_is_initialized)
|
|
return;
|
|
@@ -383,7 +384,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
// See https://crbug.com/v8/11043
|
|
SetFlags(mode, js_command_line_flags);
|
|
|
|
- v8::V8::InitializePlatform(V8Platform::Get());
|
|
+ if (create_v8_platform)
|
|
+ v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
// Set this as early as possible in order to ensure OOM errors are reported
|
|
// correctly.
|
|
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
|
|
index d499cb43c4e12ca32912fce7078fcadff7509a87..dd9899c3e0dbadfc0074ffce87d51193e1c963cb 100644
|
|
--- a/gin/v8_initializer.h
|
|
+++ b/gin/v8_initializer.h
|
|
@@ -31,7 +31,8 @@ class GIN_EXPORT V8Initializer {
|
|
// This should be called by IsolateHolder::Initialize().
|
|
static void Initialize(IsolateHolder::ScriptMode mode,
|
|
const std::string js_command_line_flags = {},
|
|
- v8::OOMErrorCallback oom_error_callback = nullptr);
|
|
+ v8::OOMErrorCallback oom_error_callback = nullptr,
|
|
+ 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
|