Chromium Code Reviews| Index: ash/shell/content_client/shell_content_browser_client.cc |
| diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/ash/shell/content_client/shell_content_browser_client.cc |
| index 51b0107d5ad9f1b8a532e3793655f9a506b1f193..ff7e38c914f23f519ed3df98966b7e69c7eb6b50 100644 |
| --- a/ash/shell/content_client/shell_content_browser_client.cc |
| +++ b/ash/shell/content_client/shell_content_browser_client.cc |
| @@ -50,9 +50,13 @@ void ShellContentBrowserClient::AppendExtraCommandLineSwitches( |
| #if defined(V8_USE_EXTERNAL_STARTUP_DATA) |
| std::string process_type = |
| command_line->GetSwitchValueASCII(switches::kProcessType); |
| - if (process_type != switches::kZygoteProcess) { |
| + if (process_type != switches::kZygoteProcess && |
| + process_type != switches::kGpuProcess) { |
| + DCHECK(natives_fd_exists()); |
| command_line->AppendSwitch(::switches::kV8NativesPassedByFD); |
| - command_line->AppendSwitch(::switches::kV8SnapshotPassedByFD); |
| + if (snapshot_fd_exists()) { |
|
sky
2015/06/04 19:36:42
nit: no {}
Erik Corry Chromium.org
2015/06/05 13:15:16
Done.
|
| + command_line->AppendSwitch(::switches::kV8SnapshotPassedByFD); |
| + } |
| } |
| #endif // V8_USE_EXTERNAL_STARTUP_DATA |
| #endif // OS_POSIX && !OS_MACOSX |
| @@ -64,7 +68,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| int child_process_id, |
| content::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, |
| @@ -73,7 +77,9 @@ void ShellContentBrowserClient::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()); |
| #endif // V8_USE_EXTERNAL_STARTUP_DATA |