diff options
Diffstat (limited to 'www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc')
-rw-r--r-- | www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc | 57 |
1 files changed, 4 insertions, 53 deletions
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 5f3d3567cb5e..a0476b619c4a 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,60 +1,11 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-06-15 21:03:05.000000000 +0200 -+++ content/browser/renderer_host/render_process_host_impl.cc 2017-06-18 13:40:02.058069000 +0200 -@@ -381,11 +381,11 @@ - return map; - } - --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - // This static member variable holds the zygote communication information for - // the renderer. - ZygoteHandle g_render_zygote; --#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - - // NOTE: changes to this class need to be reviewed by the security team. - class RendererSandboxedProcessLauncherDelegate -@@ -408,7 +408,7 @@ +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-07-25 21:04:55.000000000 +0200 ++++ content/browser/renderer_host/render_process_host_impl.cc 2017-08-02 01:03:34.751604000 +0200 +@@ -415,7 +415,7 @@ return GetContentClient()->browser()->PreSpawnRenderer(policy); } -#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - ZygoteHandle* GetZygote() override { + ZygoteHandle GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -647,7 +647,7 @@ - g_max_renderer_count_override = count; - } - --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - // static - void RenderProcessHostImpl::EarlyZygoteLaunch() { - DCHECK(!g_render_zygote); -@@ -657,7 +657,7 @@ - ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( - (*GetGenericZygote())->GetSandboxStatus()); - } --#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - - RenderProcessHostImpl::RenderProcessHostImpl( - BrowserContext* browser_context, -@@ -807,7 +807,7 @@ - renderer_prefix = - browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF - : ChildProcessHost::CHILD_NORMAL; - #else -@@ -1551,7 +1551,6 @@ - - --visible_widgets_; - if (visible_widgets_ == 0) { -- DCHECK(!is_process_backgrounded_); - UpdateProcessPriority(); - } - } |