Date: Thu, 29 Nov 2012 14:10:36 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307962 - head/www/chromium/files Message-ID: <201211291410.qATEAagk092728@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Thu Nov 29 14:10:36 2012 New Revision: 307962 URL: http://svnweb.freebsd.org/changeset/ports/307962 Log: The renderer sandbox is unused so avoid the call to GetInstance() This prevents a crash at startup when Chromium is built in debug mode. Submitted by: George Liaskos Feature safe: yes Modified: head/www/chromium/files/patch-content__browser__child_process_launcher.cc Modified: head/www/chromium/files/patch-content__browser__child_process_launcher.cc ============================================================================== --- head/www/chromium/files/patch-content__browser__child_process_launcher.cc Thu Nov 29 12:45:01 2012 (r307961) +++ head/www/chromium/files/patch-content__browser__child_process_launcher.cc Thu Nov 29 14:10:36 2012 (r307962) @@ -1,5 +1,5 @@ --- content/browser/child_process_launcher.cc.orig 2012-10-31 21:01:35.000000000 +0200 -+++ content/browser/child_process_launcher.cc 2012-11-07 13:39:44.000000000 +0200 ++++ content/browser/child_process_launcher.cc 2012-11-19 22:35:00.000000000 +0200 @@ -52,7 +52,7 @@ termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), exit_code_(content::RESULT_CODE_NORMAL_EXIT), @@ -18,6 +18,15 @@ content::GetContentClient()->browser()-> GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register); if (use_zygote) { +@@ -209,7 +209,7 @@ + id_file.first + base::GlobalDescriptors::kBaseDescriptor)); + } + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + if (process_type == switches::kRendererProcess) { + const int sandbox_fd = + RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); @@ -261,7 +261,7 @@ base::Bind( &Context::Notify,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211291410.qATEAagk092728>