Load v8 snapshots directly from APK (and store them uncompressed)

chromecast/browser/cast_content_browser_client.cc

 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
-#include "gin/v8_initializer.h"
 #include "media/audio/audio_manager_factory.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_ANDROID)
 #include "components/crash/browser/crash_dump_manager_android.h"
 #include "components/external_video_surface/browser/android/external_video_surface_container_impl.h"
 #endif  // defined(OS_ANDROID)
 
 namespace chromecast {
 namespace shell {
 
 CastContentBrowserClient::CastContentBrowserClient()
-    : v8_natives_fd_(-1),
-      v8_snapshot_fd_(-1),
-      url_request_context_factory_(new URLRequestContextFactory()) {
+    : url_request_context_factory_(new URLRequestContextFactory()) {
 }
 
 CastContentBrowserClient::~CastContentBrowserClient() {
   content::BrowserThread::DeleteSoon(
       content::BrowserThread::IO,
       FROM_HERE,
       url_request_context_factory_.release());
 }
 
 content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts(
@@ skipping 77 matching lines @@
   if (scheme == url::kFileScheme) {
     return base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableLocalFileAccesses);
   }
 
   return false;
 }
 
 void CastContentBrowserClient::AppendMappedFileCommandLineSwitches(
     base::CommandLine* command_line) {
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
   std::string process_type =
-      command_line->GetSwitchValueNative(switches::kProcessType);
-
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
+      command_line->GetSwitchValueASCII(switches::kProcessType);
   if (process_type != switches::kZygoteProcess) {
-    DCHECK(natives_fd_exists());
+    DCHECK(v8_files_.natives_fd.is_valid());
     command_line->AppendSwitch(::switches::kV8NativesPassedByFD);
-    if (snapshot_fd_exists())
+    if (v8_files_.snapshot_fd.is_valid()) {
       command_line->AppendSwitch(::switches::kV8SnapshotPassedByFD);
+    }
   }
+#endif  // V8_USE_EXTERNAL_STARTUP_DATA
+#endif  // OS_POSIX && !OS_MACOSX
 }
 
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 void CastContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int child_process_id) {
   std::string process_type =
       command_line->GetSwitchValueNative(switches::kProcessType);
   base::CommandLine* browser_command_line =
       base::CommandLine::ForCurrentProcess();
@@ skipping 149 matching lines @@
 
 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
     content::FileDescriptorInfo* mappings
 #if defined(OS_ANDROID)
     , std::map<int, base::MemoryMappedFile::Region>* regions
 #endif
     ) {
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-  if (!natives_fd_exists()) {
-    int v8_natives_fd = -1;
-    int v8_snapshot_fd = -1;
-    if (gin::V8Initializer::OpenV8FilesForChildProcesses(&v8_natives_fd,
-                                                         &v8_snapshot_fd)) {
-      v8_natives_fd_.reset(v8_natives_fd);
-      v8_snapshot_fd_.reset(v8_snapshot_fd);
-    }
+  if (!v8_files_.natives_fd.is_valid()) {
+    gin::V8Initializer::OpenV8FilesForChildProcesses(&v8_files_);
   }
-  // V8 can't start up without the source of the natives, but it can
-  // start up (slower) without the snapshot.
-  DCHECK(natives_fd_exists());
-  mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get());
-  mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get());
+  DCHECK(v8_files_.natives_fd.is_valid());
+  mappings->Share(kV8NativesDataDescriptor, v8_files_.natives_fd.get());
+#if defined(OS_ANDROID)
+  regions->insert(
+      std::make_pair(kV8NativesDataDescriptor, v8_files_.natives_region));
+#endif
+  if (v8_files_.snapshot_fd.is_valid()) {
+    mappings->Share(kV8SnapshotDataDescriptor, v8_files_.snapshot_fd.get());
+#if defined(OS_ANDROID)
+    regions->insert(
+        std::make_pair(kV8SnapshotDataDescriptor, v8_files_.snapshot_region));
+#endif
+  }
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #if defined(OS_ANDROID)
   const int flags_open_read = base::File::FLAG_OPEN | base::File::FLAG_READ;
   base::FilePath pak_file_path;
   CHECK(PathService::Get(FILE_CAST_PAK, &pak_file_path));
   base::File pak_file(pak_file_path, flags_open_read);
   if (!pak_file.IsValid()) {
     NOTREACHED() << "Failed to open file when creating renderer process: "
                  << "cast_shell.pak";
   }
@@ skipping 73 matching lines @@
         process_type, dumps_path, false /* upload */);
   // StartUploaderThread() even though upload is diferred.
   // Breakpad-related memory is freed in the uploader thread.
   crash_handler->StartUploaderThread();
   return crash_handler;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace shell
 }  // namespace chromecast