Moved logic for mapping child process FDs for ICU and V8 into child_process_launcher.cc

content/browser/child_process_launcher.cc

 // Copyright 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/browser/child_process_launcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
+#include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_switches.h"
@@ skipping 16 matching lines @@
 #include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 #include "content/common/child_process_sandbox_support_impl_linux.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/posix/global_descriptors.h"
 #include "content/browser/file_descriptor_info_impl.h"
+#include "gin/v8_initializer.h"
 #endif
 
 namespace content {
 
 namespace {
 
 typedef base::Callback<void(bool,
 #if defined(OS_ANDROID)
                             base::ScopedFD,
 #endif
@@ skipping 78 matching lines @@
   scoped_ptr<FileDescriptorInfo> files_to_register(
       FileDescriptorInfoImpl::Create());
 
 #if defined(OS_ANDROID)
   files_to_register->Share(kPrimaryIPCChannel, ipcfd.get());
 #else
   files_to_register->Transfer(kPrimaryIPCChannel, ipcfd.Pass());
 #endif
 #endif
 
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+  std::map<int, base::MemoryMappedFile::Region> regions;
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
+  files_to_register->Share(kV8NativesDataDescriptor,
+                           gin::V8Initializer::OpenNativesFileForChildProcesses(
+                               &regions[kV8NativesDataDescriptor]));

[rmcilroy, 2015/06/12 22:09:25]

Please add a DCHECK that the natives_of is valid (I know the function already
asserts, but just in case this changes in the future).

+
+  base::MemoryMappedFile::Region snapshot_region;
+  base::PlatformFile snapshot_pf =
+      gin::V8Initializer::OpenSnapshotFileForChildProcesses(&snapshot_region);
+  // Failure to load the V8 snapshot is not necessarily an error. V8 can start
+  // up (slower) without the snapshot.
+  if (snapshot_pf != -1) {
+    files_to_register->Share(kV8SnapshotDataDescriptor, snapshot_pf);
+    regions.insert(std::make_pair(kV8SnapshotDataDescriptor, snapshot_region));
+  }
+
+  if (process_type != switches::kZygoteProcess) {
+    cmd_line->AppendSwitch(::switches::kV8NativesPassedByFD);
+    if (snapshot_pf != -1) {
+      cmd_line->AppendSwitch(::switches::kV8SnapshotPassedByFD);
+    }
+  }
+#endif  // defined(V8_USE_EXTERNAL_STARTUP_DATA)
+  GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
+      *cmd_line, child_process_id, files_to_register.get());

[rmcilroy, 2015/06/12 22:09:25]

Nit - I'd move this call above the #ifdef V8_... but that's mostly personal
preference.

+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
+
 #if defined(OS_ANDROID)
+  files_to_register->Share(
+      kAndroidICUDataDescriptor,
+      base::i18n::GetIcuDataFileHandle(&regions[kAndroidICUDataDescriptor]));
+
   // Android WebView runs in single process, ensure that we never get here
   // when running in single process mode.
   CHECK(!cmd_line->HasSwitch(switches::kSingleProcess));
-  std::map<int, base::MemoryMappedFile::Region> regions;
-  GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-      *cmd_line, child_process_id, files_to_register.get());
-
-  GetContentClient()->browser()->AppendMappedFileCommandLineSwitches(cmd_line);
 
   StartChildProcess(
       cmd_line->argv(), child_process_id, files_to_register.Pass(), regions,
       base::Bind(&OnChildProcessStartedAndroid, callback, client_thread_id,
                  begin_launch_time, base::Passed(&ipcfd)));
 
 #elif defined(OS_POSIX)
   // We need to close the client end of the IPC channel to reliably detect
   // child termination.
 
 #if !defined(OS_MACOSX)
-  GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-      *cmd_line, child_process_id, files_to_register.get());
-
-  GetContentClient()->browser()->AppendMappedFileCommandLineSwitches(cmd_line);
-
   if (use_zygote) {
     base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
         cmd_line->argv(), files_to_register.Pass(), process_type);
     process = base::Process(handle);
   } else
   // Fall through to the normal posix case below when we're not zygoting.
 #endif  // !defined(OS_MACOSX)
   {
     // Convert FD mapping to FileHandleMappingVector
     base::FileHandleMappingVector fds_to_map =
@@ skipping 331 matching lines @@
 }
 
 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
     Client* client) {
   Client* ret = client_;
   client_ = client;
   return ret;
 }
 
 }  // namespace content