c62329ccbd
Changes include: - More developer control over touch input - New JavaScript features - Unprefixed Shadow DOM - A number of new apps/extension APIs - Lots of under the hood changes for stability and performance MFH: 2014Q2 Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html
35 lines
1.4 KiB
C++
35 lines
1.4 KiB
C++
--- ./content/app/content_main_runner.cc.orig 2014-04-30 22:41:44.000000000 +0200
|
|
+++ ./content/app/content_main_runner.cc 2014-05-04 14:38:47.000000000 +0200
|
|
@@ -86,10 +86,10 @@
|
|
#include "base/posix/global_descriptors.h"
|
|
#include "content/public/common/content_descriptors.h"
|
|
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
#include "content/public/common/zygote_fork_delegate_linux.h"
|
|
#endif
|
|
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
|
#include "content/zygote/zygote_main.h"
|
|
#endif
|
|
|
|
@@ -343,7 +343,8 @@
|
|
int (*function)(const MainFunctionParams&);
|
|
};
|
|
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
|
|
+ !defined(OS_BSD)
|
|
// On platforms that use the zygote, we have a special subset of
|
|
// subprocesses that are launched via the zygote. This function
|
|
// fills in some process-launching bits around ZygoteMain().
|
|
@@ -471,7 +472,8 @@
|
|
}
|
|
}
|
|
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
|
|
+ !defined(OS_BSD)
|
|
// Zygote startup is special -- see RunZygote comments above
|
|
// for why we don't use ZygoteMain directly.
|
|
if (process_type == switches::kZygoteProcess)
|