Modified: trunk/Source/WebCore/ChangeLog (119876 => 119877)
--- trunk/Source/WebCore/ChangeLog 2012-06-08 23:41:36 UTC (rev 119876)
+++ trunk/Source/WebCore/ChangeLog 2012-06-08 23:54:16 UTC (rev 119877)
@@ -1,3 +1,11 @@
+2012-06-08 Alexey Proskuryakov <[email protected]>
+
+ <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 <[email protected]>
IndexedDB: Transactions without any request scheduled should abort itself.
Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (119876 => 119877)
--- trunk/Source/WebCore/page/mac/SettingsMac.mm 2012-06-08 23:41:36 UTC (rev 119876)
+++ trunk/Source/WebCore/page/mac/SettingsMac.mm 2012-06-08 23:54:16 UTC (rev 119877)
@@ -30,22 +30,45 @@
void Settings::initializeDefaultFontFamilies()
{
+#if !PLATFORM(IOS)
setStandardFontFamily("Apple LiSung", 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);
- setSerifFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
setSansSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
+#if !PLATFORM(IOS)
setStandardFontFamily("STSong", 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);
- setSerifFontFamily("STSong", 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 @@
setFixedFontFamily("AppleGothic", USCRIPT_HANGUL);
setSansSerifFontFamily("AppleGothic", USCRIPT_HANGUL);
#endif
- setSerifFontFamily("AppleMyungjo", USCRIPT_HANGUL);
setStandardFontFamily("Times", USCRIPT_COMMON);
setFixedFontFamily("Courier", USCRIPT_COMMON);
