aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2012-11-29 22:10:36 +0800
committerrene <rene@FreeBSD.org>2012-11-29 22:10:36 +0800
commit1a2c1b0382e2dae2c177ca580907fb9c4515654c (patch)
tree2c59d371a0d3f4e8c9206b7ddbb41cb9c26b6654 /www
parent68d61f9b835e3ae5b678ac28605e1412154a0945 (diff)
downloadfreebsd-ports-gnome-1a2c1b0382e2dae2c177ca580907fb9c4515654c.tar.gz
freebsd-ports-gnome-1a2c1b0382e2dae2c177ca580907fb9c4515654c.tar.zst
freebsd-ports-gnome-1a2c1b0382e2dae2c177ca580907fb9c4515654c.zip
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
Diffstat (limited to 'www')
-rw-r--r--www/chromium/files/patch-content__browser__child_process_launcher.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc
index 1163c2a45848..a63c6df069b4 100644
--- a/www/chromium/files/patch-content__browser__child_process_launcher.cc
+++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc
@@ -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,