Commit d6c0df08 authored by ap@apple.com's avatar ap@apple.com

<rdar://problem/11412294> Add appropriate iOS default font settings

        Reviewed by Dan Bernstein.

        * page/mac/SettingsMac.mm: (WebCore::Settings::initializeDefaultFontFamilies):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@119877 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f3b125d0
2012-06-08 Alexey Proskuryakov <ap@apple.com>
<rdar://problem/11412294> Add appropriate iOS default font settings
Reviewed by Dan Bernstein.
* page/mac/SettingsMac.mm: (WebCore::Settings::initializeDefaultFontFamilies):
2012-06-08 Charles Wei <charles.wei@torchmobile.com.cn>
IndexedDB: Transactions without any request scheduled should abort itself.
......
......@@ -30,22 +30,45 @@ namespace WebCore {
void Settings::initializeDefaultFontFamilies()
{
#if !PLATFORM(IOS)
setStandardFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
setFixedFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
setSerifFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
#else
// There is no serif Chinese font in default iOS installation.
setStandardFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
setSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
#endif
setFixedFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
setSansSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
#if !PLATFORM(IOS)
setStandardFontFamily("STSong", USCRIPT_SIMPLIFIED_HAN);
setFixedFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
setSerifFontFamily("STSong", USCRIPT_SIMPLIFIED_HAN);
#else
// There is no serif Chinese font in default iOS installation.
setStandardFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
setSerifFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
#endif
setFixedFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
setSansSerifFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
#if !PLATFORM(IOS)
setFixedFontFamily("Osaka-Mono", USCRIPT_KATAKANA_OR_HIRAGANA);
#else
setFixedFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
#endif
setSerifFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
setSansSerifFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
#if !PLATFORM(IOS)
setStandardFontFamily("AppleMyungjo", USCRIPT_HANGUL);
setSerifFontFamily("AppleMyungjo", USCRIPT_HANGUL);
#else
// There is no serif Korean font in default iOS installation.
setStandardFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
setSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
#endif
#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
setFixedFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
setSansSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
......@@ -53,7 +76,6 @@ void Settings::initializeDefaultFontFamilies()
setFixedFontFamily("AppleGothic", USCRIPT_HANGUL);
setSansSerifFontFamily("AppleGothic", USCRIPT_HANGUL);
#endif
setSerifFontFamily("AppleMyungjo", USCRIPT_HANGUL);
setStandardFontFamily("Times", USCRIPT_COMMON);
setFixedFontFamily("Courier", USCRIPT_COMMON);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment