aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc')
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index 2fe87557e6d5..494d457e7234 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-07-07 21:58:17 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-11-13 06:36:48 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.cc
-@@ -83,7 +83,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";
+@@ -80,7 +80,7 @@ const char kColorEmojiLocale[] = "und-Zsye";
SkFontMgr* FontCache::static_font_manager_ = nullptr;
@@ -9,12 +9,12 @@
float FontCache::device_scale_factor_ = 1.0;
#endif
-@@ -123,7 +123,7 @@ FontCache::FontCache()
+@@ -120,7 +120,7 @@ FontCache::FontCache()
FontPlatformData* FontCache::SystemFontPlatformData(
const FontDescription& font_description) {
const AtomicString& family = FontCache::SystemFontFamily();
--#if defined(OS_LINUX) || defined(OS_FUCHSIA)
-+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
if (family.IsEmpty() || family == font_family_names::kSystemUi)
return nullptr;
#else