1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- content/renderer/renderer_blink_platform_impl.cc.orig 2016-05-27 22:47:40.255637000 -0400
+++ content/renderer/renderer_blink_platform_impl.cc 2016-05-28 10:09:25.718992000 -0400
@@ -116,7 +116,7 @@
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FREEBSD)
#include <map>
#include <string>
@@ -207,7 +207,7 @@
scoped_refptr<ThreadSafeSender> thread_safe_sender_;
};
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
class RendererBlinkPlatformImpl::SandboxSupport
: public blink::WebSandboxSupport {
public:
@@ -253,7 +253,7 @@
web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
renderer_scheduler_(renderer_scheduler),
blink_service_registry_(new BlinkServiceRegistryImpl(service_registry)) {
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
if (g_sandbox_enabled && sandboxEnabled()) {
sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
} else {
@@ -284,7 +284,7 @@
}
void RendererBlinkPlatformImpl::Shutdown() {
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
// SandboxSupport contains a map of WebFontFamily objects, which hold
// WebCStrings, which become invalidated when blink is shut down. Hence, we
// need to clear that map now, just before blink::shutdown() is called.
@@ -334,7 +334,7 @@
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
-#if defined(OS_ANDROID) || defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FREEBSD)
// These platforms do not require sandbox support.
return NULL;
#else
@@ -562,7 +562,7 @@
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}
-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FREEBSD)
void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
blink::WebUChar32 character,
|
