Index: third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm |
diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm b/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm |
index 5956c7a737beead71d6df78f75f6246d807c35e4..a9b9a9eccb1958e2dd3d24e0dc0f1b50ab24f766 100644 |
--- a/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm |
+++ b/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm |
@@ -61,6 +61,19 @@ namespace blink { |
const char* kColorEmojiFontMac = "Apple Color Emoji"; |
+// static |
+const AtomicString& FontCache::legacySystemFontFamily() { |
+ DEFINE_STATIC_LOCAL(AtomicString, legacySystemFontFamily, |
+ ("BlinkMacSystemFont")); |
+ return legacySystemFontFamily; |
+} |
+ |
+// static |
+const AtomicString& FontCache::systemFontFamily(float) { |
drott
2016/10/12 11:01:59
When will you need the parameter? If Mac instantia
kojii
2016/10/12 11:14:52
I'm thinking to replace "system-ui" with ".SF NS T
drott
2016/10/13 07:59:34
So you're saying you would like to move the replac
kojii
2016/10/13 09:03:20
Yes, that way we can keep one SkTypeface/SimpleFon
drott
2016/10/13 12:36:13
Yes, sounds reasonable.
|
+ // TODO(kojii): Get the actual font name for the size. |
+ return FontFamilyNames::system_ui; |
+} |
+ |
static void invalidateFontCache() { |
if (!isMainThread()) { |
Platform::current()->mainThread()->getWebTaskRunner()->postTask( |