Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Unified Diff: content/app/content_main_runner.cc

Issue 1011133006: Move V8 snapshot loading code from isolate_holder to gin/v8_startup_data.{h,cc}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix missing #ifdef in V8Initializer::Initialize. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/DEPS ('k') | content/public/test/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 43c0d006ccadb7f294366c41e4489e00ba5db2f7..fdd177fbef3c5066f5cc87f412afbc3d7a184148 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -51,7 +51,7 @@
#include "ui/base/ui_base_switches.h"
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
-#include "gin/public/isolate_holder.h"
+#include "gin/v8_initializer.h"
#endif
#if defined(USE_TCMALLOC)
@@ -717,14 +717,14 @@ class ContentMainRunnerImpl : public ContentMainRunner {
if (v8_natives_fd != -1 && v8_snapshot_fd != -1) {
auto v8_natives_region = g_fds->GetRegion(kV8NativesDataDescriptor);
auto v8_snapshot_region = g_fds->GetRegion(kV8SnapshotDataDescriptor);
- CHECK(gin::IsolateHolder::LoadV8SnapshotFd(
+ CHECK(gin::V8Initializer::LoadV8SnapshotFromFD(
v8_natives_fd, v8_natives_region.offset, v8_natives_region.size,
v8_snapshot_fd, v8_snapshot_region.offset, v8_snapshot_region.size));
} else {
- CHECK(gin::IsolateHolder::LoadV8Snapshot());
+ CHECK(gin::V8Initializer::LoadV8Snapshot());
}
#else
- CHECK(gin::IsolateHolder::LoadV8Snapshot());
+ CHECK(gin::V8Initializer::LoadV8Snapshot());
#endif // OS_POSIX && !OS_MACOSX
#endif // V8_USE_EXTERNAL_STARTUP_DATA
« no previous file with comments | « content/app/DEPS ('k') | content/public/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698