OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/zygote_host/zygote_communication_linux.h" | 5 #include "content/browser/zygote_host/zygote_communication_linux.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 #include <sys/socket.h> | 8 #include <sys/socket.h> |
9 | 9 |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/metrics/histogram_macros.h" | 13 #include "base/metrics/histogram_macros.h" |
14 #include "base/metrics/sparse_histogram.h" | 14 #include "base/metrics/sparse_histogram.h" |
15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
16 #include "base/pickle.h" | 16 #include "base/pickle.h" |
17 #include "base/posix/eintr_wrapper.h" | 17 #include "base/posix/eintr_wrapper.h" |
18 #include "base/posix/unix_domain_socket_linux.h" | 18 #include "base/posix/unix_domain_socket_linux.h" |
19 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 19 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
20 #include "content/common/zygote_commands_linux.h" | 20 #include "content/common/zygote_commands_linux.h" |
21 #include "content/public/browser/content_browser_client.h" | 21 #include "content/public/browser/content_browser_client.h" |
22 #include "content/public/common/content_client.h" | 22 #include "content/public/common/content_client.h" |
23 #include "content/public/common/content_switches.h" | 23 #include "content/public/common/content_switches.h" |
24 #include "content/public/common/result_codes.h" | 24 #include "content/public/common/result_codes.h" |
25 #include "ui/display/display_switches.h" | 25 #include "ui/display/display_switches.h" |
| 26 #include "ui/gfx/switches.h" |
26 | 27 |
27 namespace content { | 28 namespace content { |
28 | 29 |
29 ZygoteCommunication::ZygoteCommunication() | 30 ZygoteCommunication::ZygoteCommunication() |
30 : control_fd_(), | 31 : control_fd_(), |
31 control_lock_(), | 32 control_lock_(), |
32 pid_(), | 33 pid_(), |
33 list_of_running_zygote_children_(), | 34 list_of_running_zygote_children_(), |
34 child_tracking_lock_(), | 35 child_tracking_lock_(), |
35 sandbox_status_(0), | 36 sandbox_status_(0), |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix)); | 246 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix)); |
246 } | 247 } |
247 // Append any switches from the browser process that need to be forwarded on | 248 // Append any switches from the browser process that need to be forwarded on |
248 // to the zygote/renderers. | 249 // to the zygote/renderers. |
249 // Should this list be obtained from browser_render_process_host.cc? | 250 // Should this list be obtained from browser_render_process_host.cc? |
250 static const char* const kForwardSwitches[] = { | 251 static const char* const kForwardSwitches[] = { |
251 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath, | 252 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath, |
252 switches::kDisableSeccompFilterSandbox, | 253 switches::kDisableSeccompFilterSandbox, |
253 switches::kEnableHeapProfiling, | 254 switches::kEnableHeapProfiling, |
254 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. | 255 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. |
| 256 // Need to tell the zygote that it is headless so that we don't try to use |
| 257 // the wrong type of main delegate. |
| 258 switches::kHeadless, |
255 // Zygote process needs to know what resources to have loaded when it | 259 // Zygote process needs to know what resources to have loaded when it |
256 // becomes a renderer process. | 260 // becomes a renderer process. |
257 switches::kForceDeviceScaleFactor, switches::kLoggingLevel, | 261 switches::kForceDeviceScaleFactor, switches::kLoggingLevel, |
258 switches::kNoSandbox, switches::kPpapiInProcess, | 262 switches::kNoSandbox, switches::kPpapiInProcess, |
259 switches::kRegisterPepperPlugins, switches::kV, switches::kVModule, | 263 switches::kRegisterPepperPlugins, switches::kV, switches::kVModule, |
260 }; | 264 }; |
261 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, | 265 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, |
262 arraysize(kForwardSwitches)); | 266 arraysize(kForwardSwitches)); |
263 | 267 |
264 GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1); | 268 GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1); |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 } | 332 } |
329 if (ReadSandboxStatus() == -1) { | 333 if (ReadSandboxStatus() == -1) { |
330 return 0; | 334 return 0; |
331 } | 335 } |
332 have_read_sandbox_status_word_ = true; | 336 have_read_sandbox_status_word_ = true; |
333 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_); | 337 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_); |
334 return sandbox_status_; | 338 return sandbox_status_; |
335 } | 339 } |
336 | 340 |
337 } // namespace content | 341 } // namespace content |
OLD | NEW |