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

Unified Diff: Source/platform/fonts/FontFallbackList.cpp

Issue 162883002: Primary FontData of FontFallbackList should have space character (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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: Source/platform/fonts/FontFallbackList.cpp
diff --git a/Source/platform/fonts/FontFallbackList.cpp b/Source/platform/fonts/FontFallbackList.cpp
index 046e962646513383aa334d0ef74fdfe8c2822f8f..8911a4c11b21238859e4b29706dfc6f0fc01876c 100644
--- a/Source/platform/fonts/FontFallbackList.cpp
+++ b/Source/platform/fonts/FontFallbackList.cpp
@@ -108,6 +108,8 @@ bool FontFallbackList::loadingCustomFonts() const
const FontData* FontFallbackList::primaryFontData(const FontDescription& fontDescription) const
{
+ bool shouldLoadCustomFont = true;
+
for (unsigned fontIndex = 0; ; ++fontIndex) {
const FontData* fontData = fontDataAt(fontDescription, fontIndex);
if (!fontData) {
@@ -116,13 +118,17 @@ const FontData* FontFallbackList::primaryFontData(const FontDescription& fontDes
return fontDataAt(fontDescription, 0);
}
+ if (fontData->isSegmented() && !toSegmentedFontData(fontData)->containsCharacter(' '))
+ continue;
+
// When a custom font is loading, we should use the correct fallback font to layout the text.
// Here skip the temporary font for the loading custom font which may not act as the correct fallback font.
if (!fontData->isLoadingFallback())
return fontData;
// Begin to load the first custom font if needed.
- if (!fontIndex) {
+ if (shouldLoadCustomFont) {
+ shouldLoadCustomFont = false;
const SimpleFontData* simpleFontData = fontData->fontDataForCharacter(' ');
if (simpleFontData && simpleFontData->customFontData())
simpleFontData->customFontData()->beginLoadIfNeeded();
« no previous file with comments | « LayoutTests/fast/css/font-face-unicode-range-load-expected.txt ('k') | Source/platform/fonts/SegmentedFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698