From owner-svn-ports-all@FreeBSD.ORG  Thu Nov 29 14:10:37 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 523BC4EC;
 Thu, 29 Nov 2012 14:10:37 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1E0C88FC13;
 Thu, 29 Nov 2012 14:10:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qATEAaE3092729;
 Thu, 29 Nov 2012 14:10:36 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qATEAagk092728;
 Thu, 29 Nov 2012 14:10:36 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211291410.qATEAagk092728@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 29 Nov 2012 14:10:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307962 - head/www/chromium/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Nov 2012 14:10:37 -0000

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,