<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186001] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186001">186001</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-06-26 10:27:32 -0700 (Fri, 26 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Sans-serif generic font family should map to PingFang
https://bugs.webkit.org/show_bug.cgi?id=146333
<rdar://problem/21521217>
Patch by Myles C. Maxfield <mmaxfield@apple.com> on 2015-06-26
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Also performs a little bit of cleanup.
Test: fast/text/han-generic-font-families.html
* page/mac/SettingsMac.mm:
(WebCore::sansSerifTraditionalHanFontFamily):
(WebCore::sansSerifSimplifiedHanFontFamily):
(WebCore::Settings::initializeDefaultFontFamilies):
LayoutTests:
* fast/text/han-generic-font-families.html: Added.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/ios-simulator/fast/text/han-generic-font-families-expected.html: Added.
* platform/mac-mavericks/fast/text/han-generic-font-families-expected.html: Added.
* platform/mac-yosemite/fast/text/han-generic-font-families-expected.html: Added.
* platform/mac/fast/text/han-generic-font-families-expected.html: Added.
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacSettingsMacmm">trunk/Source/WebCore/page/mac/SettingsMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexthangenericfontfamilieshtml">trunk/LayoutTests/fast/text/han-generic-font-families.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttexthangenericfontfamiliesexpectedhtml">trunk/LayoutTests/platform/ios-simulator/fast/text/han-generic-font-families-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexthangenericfontfamiliesexpectedhtml">trunk/LayoutTests/platform/mac/fast/text/han-generic-font-families-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfasttexthangenericfontfamiliesexpectedhtml">trunk/LayoutTests/platform/mac-mavericks/fast/text/han-generic-font-families-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemitefasttexthangenericfontfamiliesexpectedhtml">trunk/LayoutTests/platform/mac-yosemite/fast/text/han-generic-font-families-expected.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186000 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-26 17:09:57 UTC (rev 186000)
+++ trunk/LayoutTests/ChangeLog 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Sans-serif generic font family should map to PingFang
+ https://bugs.webkit.org/show_bug.cgi?id=146333
+ <rdar://problem/21521217>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/text/han-generic-font-families.html: Added.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/ios-simulator/fast/text/han-generic-font-families-expected.html: Added.
+ * platform/mac-mavericks/fast/text/han-generic-font-families-expected.html: Added.
+ * platform/mac-yosemite/fast/text/han-generic-font-families-expected.html: Added.
+ * platform/mac/fast/text/han-generic-font-families-expected.html: Added.
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2015-06-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r185971): js/dom/global-constructors-attributes.html fails on Windows
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexthangenericfontfamilieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/han-generic-font-families.html (0 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/han-generic-font-families.html (rev 0)
+++ trunk/LayoutTests/fast/text/han-generic-font-families.html 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html lang="zh-HK">
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test is designed to test WebKit's mappings for the generic font families for Han scripts.
+<div style="font-size: 50px; font-family: serif;">此段中文简体文本用于浏览器布局测试</div>
+<div style="font-size: 50px; font-family: serif;">此段繁體中文文本用於瀏覽器佈局測試</div>
+<div style="font-size: 50px; font-family: sans-serif;">&#x5d6a;&#x5d6a;&#x50fa;&#x671c;&#x9a5d;&#x9aaa;&#x5e51;&#x8522;&#x54ec;&#x5eeb;&#x85bc;&#x61a0;&#x7641;&#x6f9a;</div>
+<div style="font-size: 50px; font-family: sans-serif;">&#x9fa9;&#x9faf;&#x9fc7;&#x9faa;&#x9fb0;&#x9fc8;&#x9fab;&#x9fb1;&#x9fc9;&#x9fa6;&#x9fac;&#x9fb2;&#x9fca;&#x9fa7;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (186000 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2015-06-26 17:09:57 UTC (rev 186000)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -2276,3 +2276,6 @@
</span><span class="cx"> webkit.org/b/146139 fast/css/named-images.html [ Missing ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/146233 fast/forms/listbox-visible-size.html [ Failure ]
</span><ins>+
+# Test requires hardcoded font names, which I do not have for this port.
+fast/text/han-generic-font-families.html [ WontFix ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (186000 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-06-26 17:09:57 UTC (rev 186000)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -2399,3 +2399,6 @@
</span><span class="cx">
</span><span class="cx"> # This requires a specific font on Mac
</span><span class="cx"> fast/text/hidpi-text-selection-gap-between-words.html [ Skip ]
</span><ins>+
+# Test requires hardcoded font names, which I do not have for this port.
+fast/text/han-generic-font-families.html [ WontFix ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttexthangenericfontfamiliesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/fast/text/han-generic-font-families-expected.html (0 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/text/han-generic-font-families-expected.html (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/han-generic-font-families-expected.html 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html lang="zh-HK">
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test is designed to test WebKit's mappings for the generic font families for Han scripts.
+<div style="font-size: 50px; font-family: 'PingFang SC';">此段中文简体文本用于浏览器布局测试</div>
+<div style="font-size: 50px; font-family: 'PingFang TC';">此段繁體中文文本用於瀏覽器佈局測試</div>
+<div style="font-size: 50px; font-family: 'PingFang SC';">&#x5d6a;&#x5d6a;&#x50fa;&#x671c;&#x9a5d;&#x9aaa;&#x5e51;&#x8522;&#x54ec;&#x5eeb;&#x85bc;&#x61a0;&#x7641;&#x6f9a;</div>
+<div style="font-size: 50px; font-family: 'PingFang TC';">&#x9fa9;&#x9faf;&#x9fc7;&#x9faa;&#x9fb0;&#x9fc8;&#x9fab;&#x9fb1;&#x9fc9;&#x9fa6;&#x9fac;&#x9fb2;&#x9fca;&#x9fa7;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexthangenericfontfamiliesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/han-generic-font-families-expected.html (0 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/han-generic-font-families-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/han-generic-font-families-expected.html 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html lang="zh-HK">
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test is designed to test WebKit's mappings for the generic font families for Han scripts.
+<div style="font-size: 50px; font-family: 'Songti SC';">此段中文简体文本用于浏览器布局测试</div>
+<div style="font-size: 50px; font-family: 'Songti TC';">此段繁體中文文本用於瀏覽器佈局測試</div>
+<div style="font-size: 50px; font-family: 'PingFang SC';">&#x5d6a;&#x5d6a;&#x50fa;&#x671c;&#x9a5d;&#x9aaa;&#x5e51;&#x8522;&#x54ec;&#x5eeb;&#x85bc;&#x61a0;&#x7641;&#x6f9a;</div>
+<div style="font-size: 50px; font-family: 'PingFang TC';">&#x9fa9;&#x9faf;&#x9fc7;&#x9faa;&#x9fb0;&#x9fc8;&#x9fab;&#x9fb1;&#x9fc9;&#x9fa6;&#x9fac;&#x9fb2;&#x9fca;&#x9fa7;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfasttexthangenericfontfamiliesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-mavericks/fast/text/han-generic-font-families-expected.html (0 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/text/han-generic-font-families-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/text/han-generic-font-families-expected.html 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html lang="zh-HK">
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test is designed to test WebKit's mappings for the generic font families for Han scripts.
+<div style="font-size: 50px; font-family: 'Songti SC';">此段中文简体文本用于浏览器布局测试</div>
+<div style="font-size: 50px; font-family: 'Songti TC';">此段繁體中文文本用於瀏覽器佈局測試</div>
+<div style="font-size: 50px; font-family: 'Heiti SC';">&#x5d6a;&#x5d6a;&#x50fa;&#x671c;&#x9a5d;&#x9aaa;&#x5e51;&#x8522;&#x54ec;&#x5eeb;&#x85bc;&#x61a0;&#x7641;&#x6f9a;</div>
+<div style="font-size: 50px; font-family: 'Heiti TC';">&#x9fa9;&#x9faf;&#x9fc7;&#x9faa;&#x9fb0;&#x9fc8;&#x9fab;&#x9fb1;&#x9fc9;&#x9fa6;&#x9fac;&#x9fb2;&#x9fca;&#x9fa7;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemitefasttexthangenericfontfamiliesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-yosemite/fast/text/han-generic-font-families-expected.html (0 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/fast/text/han-generic-font-families-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac-yosemite/fast/text/han-generic-font-families-expected.html 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html lang="zh-HK">
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test is designed to test WebKit's mappings for the generic font families for Han scripts.
+<div style="font-size: 50px; font-family: 'Songti SC';">此段中文简体文本用于浏览器布局测试</div>
+<div style="font-size: 50px; font-family: 'Songti TC';">此段繁體中文文本用於瀏覽器佈局測試</div>
+<div style="font-size: 50px; font-family: 'Heiti SC';">&#x5d6a;&#x5d6a;&#x50fa;&#x671c;&#x9a5d;&#x9aaa;&#x5e51;&#x8522;&#x54ec;&#x5eeb;&#x85bc;&#x61a0;&#x7641;&#x6f9a;</div>
+<div style="font-size: 50px; font-family: 'Heiti TC';">&#x9fa9;&#x9faf;&#x9fc7;&#x9faa;&#x9fb0;&#x9fc8;&#x9fab;&#x9fb1;&#x9fc9;&#x9fa6;&#x9fac;&#x9fb2;&#x9fca;&#x9fa7;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (186000 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2015-06-26 17:09:57 UTC (rev 186000)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -3110,3 +3110,6 @@
</span><span class="cx">
</span><span class="cx"> #Subpixel difference
</span><span class="cx"> fast/text/decorations-vertical-underline.html [ Skip ]
</span><ins>+
+# Test requires hardcoded font names, which I do not have for this port.
+fast/text/han-generic-font-families.html [ WontFix ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186000 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-26 17:09:57 UTC (rev 186000)
+++ trunk/Source/WebCore/ChangeLog 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Sans-serif generic font family should map to PingFang
+ https://bugs.webkit.org/show_bug.cgi?id=146333
+ <rdar://problem/21521217>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Also performs a little bit of cleanup.
+
+ Test: fast/text/han-generic-font-families.html
+
+ * page/mac/SettingsMac.mm:
+ (WebCore::sansSerifTraditionalHanFontFamily):
+ (WebCore::sansSerifSimplifiedHanFontFamily):
+ (WebCore::Settings::initializeDefaultFontFamilies):
+
</ins><span class="cx"> 2015-06-26 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Curl] Compile errors; ResourceResponseBase::resourceLoadTiming() has changed return type.
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacSettingsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (186000 => 186001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-06-26 17:09:57 UTC (rev 186000)
+++ trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-06-26 17:27:32 UTC (rev 186001)
</span><span class="lines">@@ -28,60 +28,85 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static inline const char* sansSerifTraditionalHanFontFamily()
+{
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
+ return "PingFang TC";
+#else
+ return "Heiti TC";
+#endif
+}
+
+static inline const char* sansSerifSimplifiedHanFontFamily()
+{
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
+ return "PingFang SC";
+#else
+ return "Heiti SC";
+#endif
+}
+
+#if PLATFORM(MAC)
</ins><span class="cx"> void Settings::initializeDefaultFontFamilies()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> setStandardFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
</span><span class="cx"> setSerifFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
</span><del>-#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);
</del><ins>+ setFixedFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
+ setSansSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
</ins><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> setStandardFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
</span><span class="cx"> setSerifFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
</span><del>-#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);
</del><ins>+ setFixedFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
+ setSansSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
</ins><span class="cx">
</span><span class="cx"> setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> setFixedFontFamily("Osaka-Mono", USCRIPT_KATAKANA_OR_HIRAGANA);
</span><del>-#else
- setFixedFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
-#endif
</del><span class="cx"> setSerifFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
</span><span class="cx"> setSansSerifFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> setStandardFontFamily("AppleMyungjo", USCRIPT_HANGUL);
</span><span class="cx"> setSerifFontFamily("AppleMyungjo", USCRIPT_HANGUL);
</span><ins>+ setFixedFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
+ setSansSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
+
+ setStandardFontFamily("Times", USCRIPT_COMMON);
+ setFixedFontFamily("Courier", USCRIPT_COMMON);
+ setSerifFontFamily("Times", USCRIPT_COMMON);
+ setSansSerifFontFamily("Helvetica", USCRIPT_COMMON);
+}
+
</ins><span class="cx"> #else
</span><ins>+
+void Settings::initializeDefaultFontFamilies()
+{
+ // There is no serif Chinese font in default iOS installation.
+ setStandardFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
+ setSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
+ setFixedFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
+ setSansSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
+
+ // There is no serif Chinese font in default iOS installation.
+ setStandardFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
+ setSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
+ setFixedFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
+ setSansSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
+
+ setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
+ setFixedFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
+ setSerifFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
+ setSansSerifFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
+
</ins><span class="cx"> // There is no serif Korean font in default iOS installation.
</span><span class="cx"> setStandardFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
</span><span class="cx"> setSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
</span><del>-#endif
-#if PLATFORM(COCOA)
- setFixedFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
- setSansSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
-#else
</del><span class="cx"> setFixedFontFamily("AppleGothic", USCRIPT_HANGUL);
</span><span class="cx"> setSansSerifFontFamily("AppleGothic", USCRIPT_HANGUL);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> setStandardFontFamily("Times", USCRIPT_COMMON);
</span><span class="cx"> setFixedFontFamily("Courier", USCRIPT_COMMON);
</span><span class="cx"> setSerifFontFamily("Times", USCRIPT_COMMON);
</span><span class="cx"> setSansSerifFontFamily("Helvetica", USCRIPT_COMMON);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>