894e056e6b
* chore: bump chromium in DEPS to 114.0.5721.0
* chore: update patches
* chore: bump chromium in DEPS to 114.0.5723.0
* chore: update patches
* chore: bump chromium in DEPS to 114.0.5725.0
* chore: update patches
* chore: bump chromium in DEPS to 114.0.5727.0
* chore: bump chromium in DEPS to 114.0.5729.0
* chore: bump chromium in DEPS to 114.0.5731.0
* chore: update patches
* 4450570: Clean up content shell
https://chromium-review.googlesource.com/c/chromium/src/+/4450570
* 4262527: geolocation: Introduce mojom::GeopositionResult
https://chromium-review.googlesource.com/c/chromium/src/+/4262527
* 4450327
: Android/Nav: Stop taking content timeout timer from old host.
https://chromium-review.googlesource.com/c/chromium/src/+/4450327
Also, see:
4451366: Reland "Prerender: Fix prerender new content timeout start timing"
https://chromium-review.googlesource.com/c/chromium/src/+/4451366
* chore: bump chromium in DEPS to 114.0.5733.2
* chore: update patches
* chore: bump CircleCI xcode version
this will hopefully get us the necessary macOS sdk 13.3 on CI.
* chore: bump chromium in DEPS to 114.0.5735.0
* chore: update patches
* test: fix geolocation test
* chore: bump chromium in DEPS to 115.0.5736.0
* chore: update patches
* chore: bump chromium in DEPS to 115.0.5738.0
* chore: update patches
* fix: remove profiles from spellcheck service
* chore: update libc++ filenames
* chore: bump chromium in DEPS to 115.0.5740.0
* chore: update patches
* chore: bump chromium in DEPS to 115.0.5742.0
* chore: update patches
* chore: bump chromium in DEPS to 115.0.5744.0
* chore: update patches
* chore: bump chromium in DEPS to 115.0.5746.0
* chore: update patches
* chore: update filenames.libcxx.gni
* chore: bump chromium in DEPS to 115.0.5748.0
* chore: update patches
* build: update libcxx filenames
* chore: bump chromium in DEPS to 115.0.5750.0
* chore: bump chromium in DEPS to 115.0.5752.2
* chore: bump chromium in DEPS to 115.0.5754.0
* chore: bump chromium in DEPS to 115.0.5756.0
* chore: bump chromium in DEPS to 115.0.5758.0
* chore: update patches
* chore: update patch after rebase
* 4500969: Delete content/dev_ui_content_resources.grd file.
https://chromium-review.googlesource.com/c/chromium/src/+/4500969
* Use base.Value.Dict in OmahaAttributesHandler related code
https://chromium-review.googlesource.com/c/chromium/src/+/4506402
* chore: bump chromium in DEPS to 115.0.5760.0
* chore: update patches
* chore: fixup line endings
* 4336172: Include client-drawn window decorations in aspect ratio. |
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4336172
(cherry picked from commit 27c2f6c43e8e4a792b33fdf8cf3af880376406be)
* spec: fix race condition in alwaysOnTop test
(cherry picked from commit 2ec5213fa0998d9cf21248257e7b5a5581044ea3)
* build: use xcode 14.2 not 14.3
(cherry picked from commit b7c62351a77102e854a801c363f391b177ebf672)
* build: use macOS 12 to run tests
The new macOS 13 VMs appear to have different screen / display behavior
(cherry picked from commit 14dc1dbc24cec85111a7482b49049f6acbfbc5f1)
* Remove always-true flag --harmony-sharedarraybuffer
https://chromium-review.googlesource.com/c/v8/v8/+/4429630
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
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 e8608bb868c82c9af5426cd6f8512ce6b18ff39f..6268851494a0bbc0b3e693782dae6171f6347657 100644
|
|
--- a/gin/isolate_holder.cc
|
|
+++ b/gin/isolate_holder.cc
|
|
@@ -136,9 +136,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 ee54275c61ee283e7ef1dcf4bf04ccaccabbd0d6..8a0a8c4f678c017d455981d723eff04d2463082a 100644
|
|
--- a/gin/v8_initializer.cc
|
|
+++ b/gin/v8_initializer.cc
|
|
@@ -395,7 +395,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;
|
|
@@ -405,7 +406,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
|