diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-03-07 22:13:12 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-03-07 22:13:12 +0000 |
| commit | fcc148b0d09fd83d06e1ca68b99695c57798f8d8 (patch) | |
| tree | 87766b8cefb01b1ecbecccc70358a384197b290d /www/chromium/files/patch-content_browser_browser__main__loop.cc | |
| parent | net-p2p/go-ethereum: Update to 1.8.2 (diff) | |
www/chromium: update to 64.0.3282.186
Changelog: https://chromium.googlesource.com/chromium/src/+log/63.0.3239.132..64.0.3282.186?pretty=fuller&n=10000
MFH: 2018Q1
Security: https://vuxml.freebsd.org/freebsd/8e986b2b-1baa-11e8-a944-54ee754af08e.html
Security: https://vuxml.freebsd.org/freebsd/abfc932e-1ba8-11e8-a944-54ee754af08e.html
Diffstat (limited to 'www/chromium/files/patch-content_browser_browser__main__loop.cc')
| -rw-r--r-- | www/chromium/files/patch-content_browser_browser__main__loop.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 02fe6f4fa932..91ce9b1691cd 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2018-01-04 21:05:49.000000000 +0100 -+++ content/browser/browser_main_loop.cc 2018-01-21 04:50:16.739260000 +0100 -@@ -198,7 +198,7 @@ +--- content/browser/browser_main_loop.cc.orig 2018-02-24 16:25:14.000000000 +0100 ++++ content/browser/browser_main_loop.cc 2018-03-04 10:01:31.265940000 +0100 +@@ -206,7 +206,7 @@ #include "base/fuchsia/default_job.h" #endif // defined(OS_FUCHSIA) @@ -9,20 +9,20 @@ #include "content/browser/sandbox_host_linux.h" #include "content/browser/zygote_host/zygote_host_impl_linux.h" -@@ -232,6 +232,11 @@ - #include "gpu/vulkan/vulkan_implementation.h" +@@ -244,6 +244,11 @@ + #include "services/ui/common/image_cursors_set.h" #endif +#if defined(OS_BSD) +#include "content/browser/sandbox_host_linux.h" -+#include "content/common/sandbox_linux/sandbox_linux.h" ++#include "content/public/common/common_sandbox_support_linux.h" +#endif + // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -249,7 +254,7 @@ - } +@@ -253,7 +258,7 @@ + namespace { #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ - !defined(OS_FUCHSIA) @@ -30,7 +30,7 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); // SandboxHostLinux needs to be initialized even if the sandbox and -@@ -272,7 +277,7 @@ +@@ -276,7 +281,7 @@ generic_zygote->GetSandboxStatus()); } #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ @@ -39,7 +39,7 @@ #if defined(USE_GLIB) static void GLibLogHandler(const gchar* log_domain, -@@ -574,10 +579,15 @@ +@@ -619,10 +624,15 @@ TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ @@ -56,7 +56,7 @@ #endif #if defined(USE_X11) -@@ -1619,12 +1629,12 @@ +@@ -1691,12 +1701,12 @@ base::WrapUnique<SwapMetricsDriver::Delegate>( new SwapMetricsDelegateUma())); |