Index: Source/platform/fonts/android/FontCacheAndroid.cpp |
diff --git a/Source/platform/fonts/android/FontCacheAndroid.cpp b/Source/platform/fonts/android/FontCacheAndroid.cpp |
index 24802fa6793fedad5a09727412633398917f8b4c..4f36d73221b5ca37cf6a3c048b99142be65019e0 100644 |
--- a/Source/platform/fonts/android/FontCacheAndroid.cpp |
+++ b/Source/platform/fonts/android/FontCacheAndroid.cpp |
@@ -64,7 +64,8 @@ static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script) |
SkString skiaFamilyName; |
if (!SkGetFallbackFamilyNameForChar(c, locale, &skiaFamilyName) || skiaFamilyName.isEmpty()) |
- return AtomicString(); |
+ return emptyAtom; |
+ |
return skiaFamilyName.c_str(); |
} |
@@ -72,7 +73,7 @@ PassRefPtr<SimpleFontData> FontCache::platformFallbackForCharacter(const FontDes |
{ |
AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.script()); |
if (familyName.isEmpty()) |
- return nullptr; |
+ return getLastResortFallbackFont(fontDescription, DoNotRetain); |
return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, familyName), DoNotRetain); |
} |