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

Unified Diff: content/shell/browser/shell_content_browser_client.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/shell/DEPS ('k') | content/test/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index c10761ffab090e45d63913a97b5029ff821ce85b..9cf8473fa4cefecb524a0330d46cba544a483fb1 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -34,7 +34,7 @@
#include "content/shell/common/shell_messages.h"
#include "content/shell/common/shell_switches.h"
#include "content/shell/common/webkit_test_helpers.h"
-#include "gin/public/isolate_holder.h"
+#include "gin/v8_initializer.h"
#include "net/url_request/url_request_context_getter.h"
#include "url/gurl.h"
@@ -335,14 +335,14 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
if (v8_snapshot_fd_.get() == -1 && v8_natives_fd_.get() == -1) {
base::FilePath v8_data_path;
- PathService::Get(gin::IsolateHolder::kV8SnapshotBasePathKey, &v8_data_path);
+ PathService::Get(gin::V8Initializer::kV8SnapshotBasePathKey, &v8_data_path);
DCHECK(!v8_data_path.empty());
int file_flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
base::FilePath v8_natives_data_path =
- v8_data_path.AppendASCII(gin::IsolateHolder::kNativesFileName);
+ v8_data_path.AppendASCII(gin::V8Initializer::kNativesFileName);
base::FilePath v8_snapshot_data_path =
- v8_data_path.AppendASCII(gin::IsolateHolder::kSnapshotFileName);
+ v8_data_path.AppendASCII(gin::V8Initializer::kSnapshotFileName);
base::File v8_natives_data_file(v8_natives_data_path, file_flags);
base::File v8_snapshot_data_file(v8_snapshot_data_path, file_flags);
DCHECK(v8_natives_data_file.IsValid());
« no previous file with comments | « content/shell/DEPS ('k') | content/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698