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
57
58
59
60
61
62
63
64
65
|
--- content/renderer/renderer_blink_platform_impl.cc.orig 2016-01-21 16:33:48.151980879 +0100
+++ content/renderer/renderer_blink_platform_impl.cc 2016-01-21 16:36:48.239968431 +0100
@@ -108,7 +108,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_BSD)
#include <map>
#include <string>
@@ -199,7 +199,7 @@
scoped_refptr<ThreadSafeSender> thread_safe_sender_;
};
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
class RendererBlinkPlatformImpl::SandboxSupport
: public blink::WebSandboxSupport {
public:
@@ -226,7 +226,7 @@
std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
#endif
};
-#endif // !defined(OS_ANDROID) && !defined(OS_WIN)
+#endif // !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
//------------------------------------------------------------------------------
@@ -243,7 +243,7 @@
loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
renderer_scheduler_(renderer_scheduler) {
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
if (g_sandbox_enabled && sandboxEnabled()) {
sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
} else {
@@ -268,7 +268,7 @@
}
void RendererBlinkPlatformImpl::Shutdown() {
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
// 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.
@@ -328,7 +328,7 @@
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
-#if defined(OS_ANDROID) || defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
// These platforms do not require sandbox support.
return NULL;
#else
@@ -598,7 +598,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_BSD)
void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
blink::WebUChar32 character,
|
