blob: 092388b027041f2ec8099e9cf3dda242702fa00a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-04-19 19:06:50 UTC
+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
@@ -68,7 +68,7 @@ AtomicString toAtomicString(const SkStri
return AtomicString::fromUTF8(str.c_str(), str.size());
}
-#if OS(ANDROID) || OS(LINUX)
+#if OS(ANDROID) || OS(LINUX) || OS(BSD)
// Android special locale for retrieving the color emoji font
// based on the proposed changes in UTR #51 for introducing
// an Emoji script code:
@@ -240,7 +240,7 @@ sk_sp<SkTypeface> FontCache::createTypef
}
#endif
-#if OS(LINUX) || OS(WIN)
+#if OS(LINUX) || OS(WIN) || OS(BSD)
// On linux if the fontManager has been overridden then we should be calling
// the embedder provided font Manager rather than calling
// SkTypeface::CreateFromName which may redirect the call to the default font
|
