Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1063)

Unified Diff: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

Issue 2137483004: Enable "system-ui" generic font family (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: drott nit Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
index d7c4fdfc950541c5edb2a30d4239a5174bef6a50..a47fc8eb1dadd60bf45810950f712538e1c531fe 100644
--- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
+++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
@@ -39,6 +39,27 @@
namespace blink {
+static AtomicString defaultFontFamily(SkFontMgr* fontManager) {
+ sk_sp<SkTypeface> typeface(
+ fontManager->legacyCreateTypeface(nullptr, SkFontStyle()));
+ SkString familyName;
+ typeface->getFamilyName(&familyName);
+ return familyName.c_str();
+}
+
+static AtomicString defaultFontFamily() {
+ if (SkFontMgr* fontManager = FontCache::fontCache()->fontManager())
+ return defaultFontFamily(fontManager);
+ sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());
+ return defaultFontFamily(fm.get());
+}
+
+// static
+const AtomicString& FontCache::systemFontFamily() {
+ DEFINE_STATIC_LOCAL(AtomicString, systemFontFamily, (defaultFontFamily()));
+ return systemFontFamily;
+}
+
PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
const FontDescription& fontDescription,
UChar32 c,

Powered by Google App Engine
This is Rietveld 408576698