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

Unified Diff: Source/platform/fonts/FontCache.h

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/Font.cpp ('k') | Source/platform/fonts/android/FontCacheAndroid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontCache.h
diff --git a/Source/platform/fonts/FontCache.h b/Source/platform/fonts/FontCache.h
index 975569b102199e2a17c877b6b5e54e8ff8569ad5..0aef86a8dbce5ef78c316d0a8b169f57bef9d1b6 100644
--- a/Source/platform/fonts/FontCache.h
+++ b/Source/platform/fonts/FontCache.h
@@ -78,7 +78,7 @@ public:
// This method is implemented by the plaform and used by
// FontFastPath to lookup the font for a given character.
- PassRefPtr<SimpleFontData> platformFallbackForCharacter(const FontDescription&, UChar32, const SimpleFontData* fontDataToSubstitute);
+ PassRefPtr<SimpleFontData> fallbackFontForCharacter(const FontDescription&, UChar32, const SimpleFontData* fontDataToSubstitute);
// Also implemented by the platform.
void platformInit();
@@ -118,12 +118,14 @@ public:
#if OS(ANDROID)
static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, UScriptCode);
#else
- struct SimpleFontFamily {
+ struct PlatformFallbackFont {
String name;
+ CString filename;
+ int ttcIndex;
bool isBold;
bool isItalic;
};
- static void getFontFamilyForCharacter(UChar32, const char* preferredLocale, SimpleFontFamily*);
+ static void getFontForCharacter(UChar32, const char* preferredLocale, PlatformFallbackFont*);
#endif
private:
« no previous file with comments | « Source/platform/fonts/Font.cpp ('k') | Source/platform/fonts/android/FontCacheAndroid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698