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

Unified Diff: Source/core/platform/graphics/FontCache.h

Issue 24622002: Workaround font preference in CJK DOM locales (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Test Created 7 years, 3 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/core/platform/graphics/FontCache.h
diff --git a/Source/core/platform/graphics/FontCache.h b/Source/core/platform/graphics/FontCache.h
index 882b5eeb7b1039573497e05c80a64fda5d71e9f8..bcce6fa9b2a634351d62caf8a20e9d7f5312bad8 100644
--- a/Source/core/platform/graphics/FontCache.h
+++ b/Source/core/platform/graphics/FontCache.h
@@ -106,12 +106,16 @@ public:
PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
#endif
+#if OS(ANDROID)
+ static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, UScriptCode);
+#else
struct SimpleFontFamily {
String name;
bool isBold;
bool isItalic;
};
static void getFontFamilyForCharacter(UChar32, const char* preferredLocale, SimpleFontFamily*);
+#endif
private:
FontCache();

Powered by Google App Engine
This is Rietveld 408576698