Index: Source/platform/fonts/FontFallbackList.cpp |
diff --git a/Source/platform/fonts/FontFallbackList.cpp b/Source/platform/fonts/FontFallbackList.cpp |
index 1f838eae90aa3879b0615a04eece77c649f940cc..2397099d3c5290e93dfd7eed3ef854765a3e05fb 100644 |
--- a/Source/platform/fonts/FontFallbackList.cpp |
+++ b/Source/platform/fonts/FontFallbackList.cpp |
@@ -114,8 +114,11 @@ const FontData* FontFallbackList::primaryFontData(const FontDescription& fontDes |
const FontData* fontData = fontDataAt(fontDescription, fontIndex); |
if (!fontData) { |
// All fonts are custom fonts and are loading. Return the first FontData. |
- // FIXME: Correct fallback to the default font. |
- return fontDataAt(fontDescription, 0); |
+ fontData = fontDataAt(fontDescription, 0); |
+ if (!fontData) |
+ fontData = FontCache::fontCache()->getLastResortFallbackFont(fontDescription).get(); |
+ ASSERT(fontData); |
+ return fontData; |
} |
if (fontData->isSegmented() && !toSegmentedFontData(fontData)->containsCharacter(' ')) |