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

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

Issue 2851653002: Make sanitizer signal handlers work again. (Closed)
Patch Set: Created 3 years, 7 months 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
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"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 *base::CommandLine::ForCurrentProcess(); 243 *base::CommandLine::ForCurrentProcess();
244 if (browser_command_line.HasSwitch(switches::kZygoteCmdPrefix)) { 244 if (browser_command_line.HasSwitch(switches::kZygoteCmdPrefix)) {
245 cmd_line.PrependWrapper( 245 cmd_line.PrependWrapper(
246 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix)); 246 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix));
247 } 247 }
248 // 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
249 // to the zygote/renderers. 249 // to the zygote/renderers.
250 // Should this list be obtained from browser_render_process_host.cc? 250 // Should this list be obtained from browser_render_process_host.cc?
251 static const char* const kForwardSwitches[] = { 251 static const char* const kForwardSwitches[] = {
252 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath, 252 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath,
253 switches::kDisableInProcessStackTraces,
253 switches::kDisableSeccompFilterSandbox, switches::kEnableHeapProfiling, 254 switches::kDisableSeccompFilterSandbox, switches::kEnableHeapProfiling,
254 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. 255 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr.
255 // Need to tell the zygote that it is headless so that we don't try to use 256 // Need to tell the zygote that it is headless so that we don't try to use
256 // the wrong type of main delegate. 257 // the wrong type of main delegate.
257 switches::kHeadless, 258 switches::kHeadless,
258 // 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
259 // becomes a renderer process. 260 // becomes a renderer process.
260 switches::kForceDeviceScaleFactor, switches::kLoggingLevel, 261 switches::kForceDeviceScaleFactor, switches::kLoggingLevel,
261 switches::kNoSandbox, switches::kPpapiInProcess, 262 switches::kNoSandbox, switches::kPpapiInProcess,
262 switches::kRegisterPepperPlugins, switches::kV, switches::kVModule, 263 switches::kRegisterPepperPlugins, switches::kV, switches::kVModule,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 332 }
332 if (ReadSandboxStatus() == -1) { 333 if (ReadSandboxStatus() == -1) {
333 return 0; 334 return 0;
334 } 335 }
335 have_read_sandbox_status_word_ = true; 336 have_read_sandbox_status_word_ = true;
336 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_); 337 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_);
337 return sandbox_status_; 338 return sandbox_status_;
338 } 339 }
339 340
340 } // namespace content 341 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698