diff options
Diffstat (limited to 'www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc')
| -rw-r--r-- | www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index ee42d5ea5b4a..aee1b1146f3a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2020-07-07 21:57:43 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -61,7 +61,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. @@ -13,8 +13,8 @@ typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void FontCache::PlatformInit() {} @@ -22,17 +22,17 @@ } #endif --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(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 -@@ -263,7 +263,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -256,7 +256,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (alternate_name == AlternateFontName::kLocalUniqueFace && RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) { typeface = CreateTypefaceFromUniqueName(creation_params); |