Index: content/app/content_main_runner.cc |
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc |
index 05e45bd791c07773c4ec25089d299245cefb9ab7..55ba74811e9c0c902a7ea81e8e7cfbf44a01af8e 100644 |
--- a/content/app/content_main_runner.cc |
+++ b/content/app/content_main_runner.cc |
@@ -721,7 +721,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { |
else |
CHECK(base::i18n::InitializeICU()); |
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA |
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
int v8_natives_fd = base::GlobalDescriptors::GetInstance()->MaybeGet( |
kV8NativesDataDescriptor); |
int v8_snapshot_fd = base::GlobalDescriptors::GetInstance()->MaybeGet( |
@@ -736,10 +736,14 @@ class ContentMainRunnerImpl : public ContentMainRunner { |
#else |
CHECK(base::i18n::InitializeICU()); |
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA |
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
+#if defined(OS_WIN) |
+ CHECK(gin::IsolateHolder::LoadAndVerifyV8Snapshot()); |
grt (UTC plus 2)
2015/01/08 17:46:35
why should consumers need to know which platforms
rmcilroy
2015/01/08 18:54:14
Sounds reasonable, done.
|
+#else |
CHECK(gin::IsolateHolder::LoadV8Snapshot()); |
-#endif // V8_USE_EXTERNAL_STARTUP_DATA |
-#endif // OS_ANDROID |
+#endif // OS_WIN |
+#endif // V8_USE_EXTERNAL_STARTUP_DATA |
+#endif // OS_ANDROID |
InitializeStatsTable(command_line); |