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

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 105 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/service_registry.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
-#include "gin/v8_initializer.h"
 #include "net/base/mime_util.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 
@@ skipping 464 matching lines @@
                                   incognito));
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient()
     :
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-      v8_natives_fd_(-1),
-      v8_snapshot_fd_(-1),
-#endif  // OS_POSIX && !OS_MACOSX
       weak_factory_(this) {
 #if defined(ENABLE_PLUGINS)
   for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
     allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
   for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
     allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
   for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
     allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
 
   extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
@@ skipping 555 matching lines @@
 // of the old files using an open fd. This fd is passed to subprocesses
 // like renderers.  Here we add the flag to tell the subprocesses where
 // to find these file descriptors.
 void ChromeContentBrowserClient::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->GetSwitchValueASCII(switches::kProcessType);
   if (process_type != switches::kZygoteProcess) {
-    // We want to pass the natives by fd because after an update the file may
-    // be updated, but we want the newly launched renderers to get the old one,
-    // opened by the browser when it started.
-    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
 }
 
 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int child_process_id) {
 #if defined(OS_MACOSX)
   scoped_ptr<metrics::ClientInfo> client_info =
@@ skipping 1033 matching lines @@
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
     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());
-  if (snapshot_fd_exists())
-    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)
   base::FilePath data_path;
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
   DCHECK(!data_path.empty());
 
   int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
   base::FilePath chrome_resources_pak =
       data_path.AppendASCII("chrome_100_percent.pak");
@@ skipping 205 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome