| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index e07ea7aa1525c34b4ffab0b1a833072daa79498a..345b9ffffe82ff530ff78d10c57519f02d2bd956 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1228,9 +1228,16 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
| - if (process_type != switches::kZygoteProcess) {
|
| + if (process_type != switches::kZygoteProcess &&
|
| + process_type != switches::kGpuProcess) {
|
| + // 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());
|
| command_line->AppendSwitch(::switches::kV8NativesPassedByFD);
|
| - command_line->AppendSwitch(::switches::kV8SnapshotPassedByFD);
|
| + if (snapshot_fd_exists()) {
|
| + command_line->AppendSwitch(::switches::kV8SnapshotPassedByFD);
|
| + }
|
| }
|
| #endif // V8_USE_EXTERNAL_STARTUP_DATA
|
| #endif // OS_POSIX && !OS_MACOSX
|
| @@ -2225,7 +2232,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
| int child_process_id,
|
| FileDescriptorInfo* mappings) {
|
| #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
| - if (v8_natives_fd_.get() == -1 || v8_snapshot_fd_.get() == -1) {
|
| + if (!natives_fd_exists()) {
|
| int v8_natives_fd = -1;
|
| int v8_snapshot_fd = -1;
|
| if (gin::V8Initializer::OpenV8FilesForChildProcesses(&v8_natives_fd,
|
| @@ -2234,9 +2241,12 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
| v8_snapshot_fd_.reset(v8_snapshot_fd);
|
| }
|
| }
|
| - DCHECK(v8_natives_fd_.get() != -1 && v8_snapshot_fd_.get() != -1);
|
| + // 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());
|
| + if (snapshot_fd_exists())
|
| + mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get());
|
| #endif // V8_USE_EXTERNAL_STARTUP_DATA
|
|
|
| #if defined(OS_ANDROID)
|
|
|