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

Side by Side 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, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 Google Inc. All rights reserved. 2 * Copyright (c) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 #include "core/platform/graphics/FontCache.h" 32 #include "core/platform/graphics/FontCache.h"
33 33
34 #include "core/platform/graphics/Font.h" 34 #include "core/platform/graphics/Font.h"
35 #include "core/platform/graphics/FontDescription.h" 35 #include "core/platform/graphics/FontDescription.h"
36 #include "core/platform/graphics/SimpleFontData.h" 36 #include "core/platform/graphics/SimpleFontData.h"
37 37
38 #include "SkTypeface_android.h" 38 #include "SkTypeface_android.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script)
43 {
44 // This is a hack to use the preferred font for CJK scripts.
45 // FIXME: Use new Skia API once Android system supports per-family and per-s cript fallback fonts.
46 const char* locale;
47 switch (script) {
48 case USCRIPT_SIMPLIFIED_HAN:
49 locale = "zh-CN";
50 break;
51 case USCRIPT_TRADITIONAL_HAN:
52 locale = "zh-TW";
53 break;
54 case USCRIPT_KATAKANA_OR_HIRAGANA:
55 locale = "ja";
56 break;
57 case USCRIPT_HANGUL:
58 locale = "ko";
59 break;
60 default:
61 locale = 0;
62 break;
63 }
64
65 SkString skiaFamilyName;
66 if (!SkGetFallbackFamilyNameForChar(c, locale, &skiaFamilyName) || skiaFamil yName.isEmpty())
67 return AtomicString();
68 return skiaFamilyName.c_str();
69 }
70
42 PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c) 71 PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)
43 { 72 {
44 SkString skiaFamilyName; 73 AtomicString familyName = getFamilyNameForCharacter(c, font.fontDescription( ).script());
45 if (!SkGetFallbackFamilyNameForChar(c, &skiaFamilyName) || skiaFamilyName.is Empty()) 74 if (familyName.isEmpty())
46 return 0; 75 return 0;
47 return getFontResourceData(getFontResourcePlatformData(font.fontDescription( ), AtomicString(skiaFamilyName.c_str()), DoNotRetain), DoNotRetain); 76 return getFontResourceData(getFontResourcePlatformData(font.fontDescription( ), familyName, DoNotRetain), DoNotRetain);
77 }
78
79 // static
80 AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family Name, UScriptCode script)
81 {
82 // This is a hack to use the preferred font for CJK scripts.
83 // FIXME: Use new Skia API once Android system supports per-family and per-s cript fallback fonts.
84 UChar32 examplerChar;
85 switch (script) {
86 case USCRIPT_SIMPLIFIED_HAN:
87 case USCRIPT_TRADITIONAL_HAN:
88 case USCRIPT_KATAKANA_OR_HIRAGANA:
89 examplerChar = 0x4E00; // A common character in Japanese and Chinese.
90 break;
91 case USCRIPT_HANGUL:
92 examplerChar = 0xAC00;
93 break;
94 default:
95 // For other scripts, use the default generic family mapping logic.
96 return familyName;
97 }
98
99 return getFamilyNameForCharacter(examplerChar, script);
48 } 100 }
49 101
50 } // namespace WebCore 102 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698