From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 4 Aug 2022 22:37:01 -0500 Subject: Create browser v8 snapshot file name fuse By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This patch allows consumers 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 6fd7e2dc34d676e2b00739935992172cb2ddb2cf..22787225d94d5370d61e059dc9a4919c738de88d 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc @@ -269,8 +269,13 @@ void AsanProcessInfoCB(const char*, bool*) { } #endif // defined(ADDRESS_SANITIZER) -void LoadV8SnapshotFile(const base::CommandLine& command_line) { +void LoadV8SnapshotFile(const raw_ptr delegate, const base::CommandLine& command_line) { const gin::V8SnapshotFileType snapshot_type = GetSnapshotType(command_line); + std::string_view browser_v8_snapshot_file_name = delegate->GetBrowserV8SnapshotFilename(); + if (!browser_v8_snapshot_file_name.empty()) { + gin::V8Initializer::LoadV8SnapshotFromFileName(browser_v8_snapshot_file_name, snapshot_type); + return; + } #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) base::FileDescriptorStore& file_descriptor_store = base::FileDescriptorStore::GetInstance(); @@ -299,11 +304,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line, #endif // V8_USE_EXTERNAL_STARTUP_DATA -void LoadV8SnapshotIfNeeded(const base::CommandLine& command_line, +void LoadV8SnapshotIfNeeded(const raw_ptr delegate, + const base::CommandLine& command_line, const std::string& process_type) { #if defined(V8_USE_EXTERNAL_STARTUP_DATA) if (ShouldLoadV8Snapshot(command_line, process_type)) - LoadV8SnapshotFile(command_line); + LoadV8SnapshotFile(delegate, command_line); #endif // V8_USE_EXTERNAL_STARTUP_DATA } @@ -972,7 +978,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) { return TerminateForFatalInitializationError(); #endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) - LoadV8SnapshotIfNeeded(command_line, process_type); + LoadV8SnapshotIfNeeded(delegate_, command_line, process_type); blink::TrialTokenValidator::SetOriginTrialPolicyGetter( base::BindRepeating([]() -> blink::OriginTrialPolicy* { diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc index 8194fc8b036482eedb162ff92bb82165cdf3c8d0..f038620516d7783170bc82b3b14dde4e01f3975d 100644 --- a/content/public/app/content_main_delegate.cc +++ b/content/public/app/content_main_delegate.cc @@ -4,6 +4,8 @@ #include "content/public/app/content_main_delegate.h" +#include + #include "base/check.h" #include "base/notreached.h" #include "build/build_config.h" @@ -72,6 +74,10 @@ std::optional ContentMainDelegate::PostEarlyInitialization( return std::nullopt; } +std::string_view ContentMainDelegate::GetBrowserV8SnapshotFilename() { + return std::string_view(); +} + ContentClient* ContentMainDelegate::CreateContentClient() { return new ContentClient(); } diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h index 801bfd401ea4a8e72417d88efaa718cc6fb60883..663fec68d0c2855cdf83bb259b85c22910a67464 100644 --- a/content/public/app/content_main_delegate.h +++ b/content/public/app/content_main_delegate.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "base/notreached.h" @@ -174,6 +175,8 @@ class CONTENT_EXPORT ContentMainDelegate { virtual bool ShouldHandleConsoleControlEvents(); #endif + virtual std::string_view GetBrowserV8SnapshotFilename(); + protected: friend class ContentClientCreator; friend class ContentClientInitializer; diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc index 59abc24988ab4d194461a3ca4f4b2bb68395bada..9e0b16dda73900210bfc6305a5d32e51a704513e 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -663,8 +663,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out, #if defined(V8_USE_EXTERNAL_STARTUP_DATA) -// static -void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { +void V8Initializer::LoadV8SnapshotFromFileName(std::string_view file_name, V8SnapshotFileType snapshot_file_type) { if (g_mapped_snapshot) { // TODO(crbug.com/40558459): Confirm not loading different type of snapshot // files in a process. @@ -673,10 +672,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { base::MemoryMappedFile::Region file_region; base::File file = - OpenV8File(GetSnapshotFileName(snapshot_file_type), &file_region); + OpenV8File(file_name.data(), &file_region); LoadV8SnapshotFromFile(std::move(file), &file_region, snapshot_file_type); } +// static +void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { + const char* file_name = GetSnapshotFileName(snapshot_file_type); + + LoadV8SnapshotFromFileName(file_name, snapshot_file_type); +} + // static void V8Initializer::LoadV8SnapshotFromFile( base::File snapshot_file, diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h index ec64afd9dd91b292604ca834a91b9cfbd52eb853..6f7382cd600cd34916d9382878aee4b469dae5d0 100644 --- a/gin/v8_initializer.h +++ b/gin/v8_initializer.h @@ -7,6 +7,8 @@ #include +#include + #include "base/files/file.h" #include "base/files/memory_mapped_file.h" #include "build/build_config.h" @@ -43,6 +45,7 @@ class GIN_EXPORT V8Initializer { int* snapshot_size_out); #if defined(V8_USE_EXTERNAL_STARTUP_DATA) + static void LoadV8SnapshotFromFileName(std::string_view file_name, V8SnapshotFileType snapshot_file_type); // Load V8 snapshot from default resources, if they are available. static void LoadV8Snapshot( V8SnapshotFileType snapshot_file_type = V8SnapshotFileType::kDefault);