Title: [206791] trunk
- Revision
- 206791
- Author
- mmaxfi...@apple.com
- Date
- 2016-10-04 16:10:26 -0700 (Tue, 04 Oct 2016)
Log Message
font-family: cursive should map to KaiTi in Chinese
https://bugs.webkit.org/show_bug.cgi?id=162889
<rdar://problem/28363547>
Reviewed by Tim Horton.
Source/WebCore:
According to Bobby Tung, this is a better mapping. Previously, we were
relying on the system fallback mechanism. However, an explicit mapping
is more robust.
Test: fast/text/cursive-zh.html
* page/cocoa/SettingsCocoa.mm:
(WebCore::Settings::initializeDefaultFontFamilies):
LayoutTests:
* fast/text/cursive-zh-expected.html: Added.
* fast/text/cursive-zh.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (206790 => 206791)
--- trunk/LayoutTests/ChangeLog 2016-10-04 22:51:38 UTC (rev 206790)
+++ trunk/LayoutTests/ChangeLog 2016-10-04 23:10:26 UTC (rev 206791)
@@ -1,3 +1,14 @@
+2016-10-04 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ font-family: cursive should map to KaiTi in Chinese
+ https://bugs.webkit.org/show_bug.cgi?id=162889
+ <rdar://problem/28363547>
+
+ Reviewed by Tim Horton.
+
+ * fast/text/cursive-zh-expected.html: Added.
+ * fast/text/cursive-zh.html: Added.
+
2016-10-04 Ryan Haddad <ryanhad...@apple.com>
Marking http/tests/cache/disk-cache/disk-cache-media.html as flaky on mac-wk2.
Added: trunk/LayoutTests/fast/text/cursive-zh-expected.html (0 => 206791)
--- trunk/LayoutTests/fast/text/cursive-zh-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/cursive-zh-expected.html 2016-10-04 23:10:26 UTC (rev 206791)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test passes if the following text is rendered in KaiTi TC and the text after that is rendered in KaiTi SC.
+<div style="font: 100px 'Kaiti TC';" lang="zh_TW">打扔払扖</div>
+<div style="font: 100px 'Kaiti SC';" lang="zh_hans">打扔払扖</div>
+</body>
+</html>
\ No newline at end of file
Added: trunk/LayoutTests/fast/text/cursive-zh.html (0 => 206791)
--- trunk/LayoutTests/fast/text/cursive-zh.html (rev 0)
+++ trunk/LayoutTests/fast/text/cursive-zh.html 2016-10-04 23:10:26 UTC (rev 206791)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test passes if the following text is rendered in KaiTi TC and the text after that is rendered in KaiTi SC.
+<div style="font: 100px cursive;" lang="zh_TW">打扔払扖</div>
+<div style="font: 100px cursive;" lang="zh_hans">打扔払扖</div>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (206790 => 206791)
--- trunk/Source/WebCore/ChangeLog 2016-10-04 22:51:38 UTC (rev 206790)
+++ trunk/Source/WebCore/ChangeLog 2016-10-04 23:10:26 UTC (rev 206791)
@@ -1,3 +1,20 @@
+2016-10-04 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ font-family: cursive should map to KaiTi in Chinese
+ https://bugs.webkit.org/show_bug.cgi?id=162889
+ <rdar://problem/28363547>
+
+ Reviewed by Tim Horton.
+
+ According to Bobby Tung, this is a better mapping. Previously, we were
+ relying on the system fallback mechanism. However, an explicit mapping
+ is more robust.
+
+ Test: fast/text/cursive-zh.html
+
+ * page/cocoa/SettingsCocoa.mm:
+ (WebCore::Settings::initializeDefaultFontFamilies):
+
2016-10-04 Alex Christensen <achristen...@webkit.org>
URLParser: query-only URLs relative to file URLs should just add a query
Modified: trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm (206790 => 206791)
--- trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm 2016-10-04 22:51:38 UTC (rev 206790)
+++ trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm 2016-10-04 23:10:26 UTC (rev 206791)
@@ -69,11 +69,13 @@
setSerifFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
setFixedFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
setSansSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
+ setCursiveFontFamily("Kaiti TC", USCRIPT_TRADITIONAL_HAN);
setStandardFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
setSerifFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
setFixedFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
setSansSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
+ setCursiveFontFamily("Kaiti SC", USCRIPT_SIMPLIFIED_HAN);
setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
setFixedFontFamily(osakaMonoIsInstalled() ? "Osaka-Mono" : "Hiragino Sans", USCRIPT_KATAKANA_OR_HIRAGANA);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
