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

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

Issue 326763002: Adding WebFallbackFont and renaming SimpleFontFamily (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing mac build 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/FontCacheAndroidTest.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 69e81b68174eda804b52207da72e303aa543eb10..2ba13f834fd025e6d89d835700c39660ffe7e739 100644
--- a/Source/platform/fonts/linux/FontCacheLinux.cpp
+++ b/Source/platform/fonts/linux/FontCacheLinux.cpp
@@ -34,16 +34,26 @@
namespace WebCore {
-void FontCache::getFontFamilyForCharacter(UChar32 c, const char* preferredLocale, FontCache::SimpleFontFamily* family)
+void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, FontCache::PlatformFallbackFont* fallbackFont)
{
- blink::WebFontFamily webFamily;
- if (blink::Platform::current()->sandboxSupport())
+
+ if (blink::Platform::current()->sandboxSupport()) {
+ // TODO(dro): crbug.com/382411 Change this to using new getFallbackFontForCharacter sandbox API
+ // and WebFallbackFont class to complete the rename, and pull WebFallbackFont out of the if statement again.
+ blink::WebFontFamily webFamily;
blink::Platform::current()->sandboxSupport()->getFontFamilyForCharacter(c, preferredLocale, &webFamily);
- else
- blink::WebFontInfo::familyForChar(c, preferredLocale, &webFamily);
- family->name = String::fromUTF8(CString(webFamily.name));
- family->isBold = webFamily.isBold;
- family->isItalic = webFamily.isItalic;
+ fallbackFont->name = String::fromUTF8(CString(webFamily.name));
+ fallbackFont->isBold = webFamily.isBold;
+ fallbackFont->isItalic = webFamily.isItalic;
+ } else {
+ blink::WebFallbackFont webFallbackFont;
+ blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
+ fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
+ fallbackFont->filename = CString(webFallbackFont.filename);
+ fallbackFont->ttcIndex = webFallbackFont.ttcIndex;
+ fallbackFont->isBold = webFallbackFont.isBold;
+ fallbackFont->isItalic = webFallbackFont.isItalic;
+ }
}
}
« no previous file with comments | « Source/platform/fonts/android/FontCacheAndroidTest.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698