diff options
| author | oth <oth@chromium.org> | 2015-04-05 07:30:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-05 14:31:16 +0000 |
| commit | 05c26fde422600a25247a22f9670463216d0519a (patch) | |
| tree | a2443f512888c10b64f892b4f78f200d18c4575d /content/app/content_main_runner.cc | |
| parent | f13b7592e312f69e70062fbcf72b746eefaf13fc (diff) | |
| download | chromium_src-05c26fde422600a25247a22f9670463216d0519a.zip chromium_src-05c26fde422600a25247a22f9670463216d0519a.tar.gz chromium_src-05c26fde422600a25247a22f9670463216d0519a.tar.bz2 | |
Move V8 snapshot loading code from isolate_holder to gin/v8_startup_data.{h,cc}.
isolate_holder.h is public and used by blink and therefore cannot refer to types from base. As part of porting this to other platforms we needed to load snapshots from BaseFile descriptors.
BUG=421063
Review URL: https://codereview.chromium.org/1011133006
Cr-Commit-Position: refs/heads/master@{#323886}
Diffstat (limited to 'content/app/content_main_runner.cc')
| -rw-r--r-- | content/app/content_main_runner.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 7c8e7eb..f14c6eb 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) @@ -718,14 +718,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 |