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

Unified Diff: Source/platform/fonts/linux/FontCacheLinux.cpp

Issue 307243002: Fix font family based fallback font selection (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Windows link fix. Created 6 years, 6 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
« no previous file with comments | « Source/platform/fonts/android/FontCacheAndroid.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/linux/FontCacheLinux.cpp
diff --git a/Source/platform/fonts/linux/FontCacheLinux.cpp b/Source/platform/fonts/linux/FontCacheLinux.cpp
index 358a3e13f4719fa0cf44818cb8cf2eca333f69e8..334abd52092fb80c4e24d266342cdf66814cc62a 100644
--- a/Source/platform/fonts/linux/FontCacheLinux.cpp
+++ b/Source/platform/fonts/linux/FontCacheLinux.cpp
@@ -37,13 +37,13 @@ namespace WebCore {
void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, FontCache::PlatformFallbackFont* fallbackFont)
{
blink::WebFallbackFont webFallbackFont;
- if (blink::Platform::current()->sandboxSupport()) {
+ if (blink::Platform::current()->sandboxSupport())
blink::Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, preferredLocale, &webFallbackFont);
- } else {
+ else
blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
- }
fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
fallbackFont->filename = webFallbackFont.filename;
+ fallbackFont->fontconfigInterfaceId = webFallbackFont.fontconfigInterfaceId;
fallbackFont->ttcIndex = webFallbackFont.ttcIndex;
fallbackFont->isBold = webFallbackFont.isBold;
fallbackFont->isItalic = webFallbackFont.isItalic;
« no previous file with comments | « Source/platform/fonts/android/FontCacheAndroid.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698