blob: 6026fda14e960213c1349dedc741f0df2b5036ac (
plain) (
blame)
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
|
--- ui/views/mus/aura_init.cc.orig 2018-06-13 00:11:10.000000000 +0200
+++ ui/views/mus/aura_init.cc 2018-07-19 22:04:02.069063000 +0200
@@ -24,7 +24,7 @@
#include "ui/views/style/typography_provider.h"
#include "ui/views/views_delegate.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/cpp/font_loader.h"
#include "ui/gfx/platform_font_linux.h"
#endif
@@ -59,7 +59,7 @@
}
AuraInit::~AuraInit() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
if (font_loader_.get()) {
SkFontConfigInterface::SetGlobal(nullptr);
// FontLoader is ref counted. We need to explicitly shutdown the background
@@ -112,7 +112,7 @@
}
// Initialize the skia font code to go ask fontconfig underneath.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
SkFontConfigInterface::SetGlobal(font_loader_.get());
|
