Infrastructure for reading V8's initial snapshot from external files

content/app/content_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA) && defined(OS_MACOSX)
+#include "base/mac/bundle_locations.h"
+#endif

[rmcilroy, 2014/09/23 10:04:20]

I'm not sure you need this here either?

[baixo, 2014/09/23 11:36:46]

Done.

 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/memory.h"
 #include "base/process/process_handle.h"
 #include "base/profiler/alternate_timer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/browser_main.h"
 #include "content/common/set_process_title.h"
 #include "content/common/url_schemes.h"
 #include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/app/content_main.h"
 #include "content/public/app/content_main_delegate.h"
 #include "content/public/app/startup_helper_win.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/renderer/in_process_renderer_thread.h"
 #include "content/utility/in_process_utility_thread.h"
 #include "crypto/nss_util.h"
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA
+#include "gin/public/isolate_holder.h"
+#endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/common/content_descriptors.h"
 #endif
@@ skipping 652 matching lines @@
     RegisterPathProvider();
     RegisterContentSchemes(true);
 
 #if defined(OS_ANDROID)
     int icudata_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(
         kAndroidICUDataDescriptor);
     if (icudata_fd != -1)
       CHECK(base::i18n::InitializeICUWithFileDescriptor(icudata_fd));
     else
       CHECK(base::i18n::InitializeICU());
+
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA
+    int v8_natives_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(
+        kV8NativesDataDescriptor);
+    int v8_snapshot_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(
+        kV8SnapshotDataDescriptor);
+    if (v8_natives_fd != -1 && v8_snapshot_fd != -1)
+      CHECK(gin::IsolateHolder::LoadV8SnapshotFD(v8_natives_fd,
+                                                 v8_snapshot_fd));
+    else
+      CHECK(gin::IsolateHolder::LoadV8Snapshot());
+#endif // V8_USE_EXTERNAL_STARTUP_DATA
 #else

[rmcilroy, 2014/09/23 10:04:20]

nit - newline before the #else

[baixo, 2014/09/23 11:36:46]

Done.

     CHECK(base::i18n::InitializeICU());
-#endif
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA
+    CHECK(gin::IsolateHolder::LoadV8Snapshot());
+#endif // V8_USE_EXTERNAL_STARTUP_DATA
+#endif // OS_ANDROID
 
     InitializeStatsTable(command_line);
 
     if (delegate_)
       delegate_->PreSandboxStartup();
 
     if (!process_type.empty())
       CommonSubprocessInit(process_type);
 
 #if defined(OS_WIN)
@@ skipping 95 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content