Differential D12063 Diff 32168 head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc
Changeset View
Changeset View
Standalone View
Standalone View
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2017-04-11 14:08:45 UTC | |||||
+++ src/3rdparty/chromium/content/browser/browser_main_loop.cc | |||||
@@ -189,7 +189,7 @@ | |||||
namespace content { | |||||
namespace { | |||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | |||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) | |||||
void SetupSandbox(const base::CommandLine& parsed_command_line) { | |||||
TRACE_EVENT0("startup", "SetupSandbox"); | |||||
base::FilePath sandbox_binary; | |||||
@@ -440,7 +440,7 @@ void BrowserMainLoop::EarlyInitialization() { | |||||
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); | |||||
TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization"); | |||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | |||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) | |||||
// No thread should be created before this call, as SetupSandbox() | |||||
// will end-up using fork(). | |||||
SetupSandbox(parsed_command_line_); |