Skip to content

Commit

Permalink
chore: bump chromium to 108.0.5359.62 (22-x-y) (#36478)
Browse files Browse the repository at this point in the history
* chore: bump chromium in DEPS to 108.0.5359.62

* Trigger Build

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed Nov 29, 2022
1 parent 8d9a964 commit 71941e7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEPS
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'108.0.5359.48',
'108.0.5359.62',
'node_version':
'v16.17.1',
'nan_version':
Expand Down
Expand Up @@ -7,7 +7,7 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.

diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index fd0adfa619b5c3756d3438c58a878fe27e1f6155..00db46ba7f840e219dd0c4b6ba4bd1807d4d573f 100644
index 8d82dc3e54180da12dc55134945e291fafaa020e..5b07db2879bea5ec60c2ca19a120c07579a87346 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -38,6 +38,7 @@
Expand All @@ -18,7 +18,7 @@ index fd0adfa619b5c3756d3438c58a878fe27e1f6155..00db46ba7f840e219dd0c4b6ba4bd180
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/thread_pool/thread_pool_instance.h"
@@ -241,8 +242,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
@@ -242,8 +243,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {

#endif

Expand All @@ -33,7 +33,7 @@ index fd0adfa619b5c3756d3438c58a878fe27e1f6155..00db46ba7f840e219dd0c4b6ba4bd180
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
base::FileDescriptorStore& file_descriptor_store =
base::FileDescriptorStore::GetInstance();
@@ -271,11 +277,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
@@ -272,11 +278,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,

#endif // V8_USE_EXTERNAL_STARTUP_DATA

Expand All @@ -48,7 +48,7 @@ index fd0adfa619b5c3756d3438c58a878fe27e1f6155..00db46ba7f840e219dd0c4b6ba4bd180
#endif // V8_USE_EXTERNAL_STARTUP_DATA
}

@@ -955,7 +962,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
@@ -960,7 +967,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
return TerminateForFatalInitializationError();
#endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)

Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/load_v8_snapshot_in_browser_process.patch
Expand Up @@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
in the browser process.

diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 0e7983ac9c42cd8a33e7de842ac51655508c3411..fd0adfa619b5c3756d3438c58a878fe27e1f6155 100644
index 3336d4e49eb40b8fdece15ed803088c53acf99df..8d82dc3e54180da12dc55134945e291fafaa020e 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -262,11 +262,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
@@ -263,11 +263,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {

bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
const std::string& process_type) {
Expand Down

0 comments on commit 71941e7

Please sign in to comment.