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

Unified Diff: Source/core/platform/graphics/chromium/FontCacheAndroid.cpp

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/chromium/FontCacheAndroid.cpp
diff --git a/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp b/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp
index 2cf212a8b0254dc17a8294798dab6ebe67f64515..f8e2dedf441a6fd4aa2c36018452b7c0dd237210 100644
--- a/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp
+++ b/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp
@@ -39,12 +39,64 @@
namespace WebCore {
-PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)
+static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script)
{
+ // This is a hack to use the preferred font for CJK scripts.
+ // FIXME: Use new Skia API once Android system supports per-family and per-script fallback fonts.
+ const char* locale;
+ switch (script) {
+ case USCRIPT_SIMPLIFIED_HAN:
+ locale = "zh-CN";
+ break;
+ case USCRIPT_TRADITIONAL_HAN:
+ locale = "zh-TW";
+ break;
+ case USCRIPT_KATAKANA_OR_HIRAGANA:
+ locale = "ja";
+ break;
+ case USCRIPT_HANGUL:
+ locale = "ko";
+ break;
+ default:
+ locale = 0;
+ break;
+ }
+
SkString skiaFamilyName;
- if (!SkGetFallbackFamilyNameForChar(c, &skiaFamilyName) || skiaFamilyName.isEmpty())
+ if (!SkGetFallbackFamilyNameForChar(c, locale, &skiaFamilyName) || skiaFamilyName.isEmpty())
+ return AtomicString();
+ return skiaFamilyName.c_str();
+}
+
+PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)
+{
+ AtomicString familyName = getFamilyNameForCharacter(c, font.fontDescription().script());
+ if (familyName.isEmpty())
return 0;
- return getFontResourceData(getFontResourcePlatformData(font.fontDescription(), AtomicString(skiaFamilyName.c_str()), DoNotRetain), DoNotRetain);
+ return getFontResourceData(getFontResourcePlatformData(font.fontDescription(), familyName, DoNotRetain), DoNotRetain);
+}
+
+// static
+AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& familyName, UScriptCode script)
+{
+ // This is a hack to use the preferred font for CJK scripts.
+ // FIXME: Use new Skia API once Android system supports per-family and per-script fallback fonts.
+ UChar32 examplerChar;
+ switch (script) {
+ case USCRIPT_SIMPLIFIED_HAN:
+ case USCRIPT_TRADITIONAL_HAN:
+ case USCRIPT_KATAKANA_OR_HIRAGANA:
+ examplerChar = 0x4E00; // A common character in Japanese and Chinese.
+ break;
+ case USCRIPT_HANGUL:
+ examplerChar = 0xAC00;
+ break;
+ default:
+ // For other scripts, use the default generic family mapping logic.
+ return familyName;
+ }
+
+ return getFamilyNameForCharacter(examplerChar, script);
}
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698