Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Side by Side Diff: content/browser/zygote_host/zygote_communication_linux.cc

Issue 2570873002: Revert of Implement a runtime headless mode for Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
27 26
28 namespace content { 27 namespace content {
29 28
30 ZygoteCommunication::ZygoteCommunication() 29 ZygoteCommunication::ZygoteCommunication()
31 : control_fd_(), 30 : control_fd_(),
32 control_lock_(), 31 control_lock_(),
33 pid_(), 32 pid_(),
34 list_of_running_zygote_children_(), 33 list_of_running_zygote_children_(),
35 child_tracking_lock_(), 34 child_tracking_lock_(),
36 sandbox_status_(0), 35 sandbox_status_(0),
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix)); 245 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix));
247 } 246 }
248 // Append any switches from the browser process that need to be forwarded on 247 // Append any switches from the browser process that need to be forwarded on
249 // to the zygote/renderers. 248 // to the zygote/renderers.
250 // Should this list be obtained from browser_render_process_host.cc? 249 // Should this list be obtained from browser_render_process_host.cc?
251 static const char* const kForwardSwitches[] = { 250 static const char* const kForwardSwitches[] = {
252 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath, 251 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath,
253 switches::kDisableSeccompFilterSandbox, 252 switches::kDisableSeccompFilterSandbox,
254 switches::kEnableHeapProfiling, 253 switches::kEnableHeapProfiling,
255 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. 254 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,
259 // Zygote process needs to know what resources to have loaded when it 255 // Zygote process needs to know what resources to have loaded when it
260 // becomes a renderer process. 256 // becomes a renderer process.
261 switches::kForceDeviceScaleFactor, switches::kLoggingLevel, 257 switches::kForceDeviceScaleFactor, switches::kLoggingLevel,
262 switches::kNoSandbox, switches::kPpapiInProcess, 258 switches::kNoSandbox, switches::kPpapiInProcess,
263 switches::kRegisterPepperPlugins, switches::kV, switches::kVModule, 259 switches::kRegisterPepperPlugins, switches::kV, switches::kVModule,
264 }; 260 };
265 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, 261 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
266 arraysize(kForwardSwitches)); 262 arraysize(kForwardSwitches));
267 263
268 GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1); 264 GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 } 328 }
333 if (ReadSandboxStatus() == -1) { 329 if (ReadSandboxStatus() == -1) {
334 return 0; 330 return 0;
335 } 331 }
336 have_read_sandbox_status_word_ = true; 332 have_read_sandbox_status_word_ = true;
337 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_); 333 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_);
338 return sandbox_status_; 334 return sandbox_status_;
339 } 335 }
340 336
341 } // namespace content 337 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698