ports/www/chromium/files/patch-content__browser__browser_main_loop.cc
Rene Ladan 217593e8de Update to 27.0.1453.81
Note that this is still a beta version, and that the sysctl
kern.ipc.shm_allow_removed must be set to 1 for correct operation.

Port changes:
- add dependency on accessibility/speech-dispatcher for libspeechd
- use internal libvpx
- update disk space requirements
- add pkg-message for the above sysctl

Submitted by:	George Liaskos
Security:	http://vuxml.org/freebsd/bdd48858-9656-11e2-a9a8-00262d5ed8ee.html
2013-05-14 21:10:15 +00:00

56 lines
2 KiB
C++

--- content/browser/browser_main_loop.cc.orig 2013-02-28 10:14:31.000000000 +0200
+++ content/browser/browser_main_loop.cc 2013-03-06 21:28:00.000000000 +0200
@@ -73,7 +73,7 @@
#include "net/base/winsock_init.h"
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include <glib-object.h>
#endif
@@ -87,7 +87,7 @@
#include "ui/gfx/gtk_util.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#include <sys/stat.h>
#include "base/process_util.h"
@@ -111,7 +111,7 @@
namespace content {
namespace {
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
void SetupSandbox(const CommandLine& parsed_command_line) {
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
// code en masse out of chrome_main for now.
@@ -139,7 +139,7 @@
}
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
static void GLibLogHandler(const gchar* log_domain,
GLogLevelFlags log_level,
const gchar* message,
@@ -311,7 +311,7 @@
crypto::EnsureNSPRInit();
#endif // !defined(USE_OPENSSL)
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
SetupSandbox(parsed_command_line_);
#endif
@@ -758,7 +758,7 @@
// are no #else branches on any #ifs.
// TODO(stevenjb): Move platform specific code into platform specific Parts
// (Need to add InitializeToolkit stage to BrowserParts).
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
// g_type_init will be deprecated in 2.36. 2.35 is the development
// version for 2.36, hence do not call g_type_init starting 2.35.
// http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init