<!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>[175579] 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/175579">175579</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 14:04:23 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[OSX] CJK characters styled with font-family: cursive are italicized
https://bugs.webkit.org/show_bug.cgi?id=138328
rdar://problem/18801907
Reviewed by Simon Fraser.
Source/WebCore:
FontCache::createFontPlatformData doesn’t set the oblique flag if
the requested font isn’t oblique, but
FontCache::systemFallbackForCharacters() does. This patch simply
adopts this behavior in both places.
Test: fast/text/font-cursive-italic-cjk.html
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::FontCache::systemFallbackForCharacters):
LayoutTests:
Make sure that the text matches the output of a different codepath.
* platform/mac/fast/text/font-cursive-italic-cjk-expected.html: Added.
* platform/mac/fast/text/font-cursive-italic-cjk.html: Added.
* platform/mac/TestExpectations: Skipped test on non-Yosemite platforms.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfasttextfontcursiveitaliccjkexpectedhtml">trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextfontcursiveitaliccjkhtml">trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175578 => 175579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-11-04 22:03:20 UTC (rev 175578)
+++ trunk/LayoutTests/ChangeLog        2014-11-04 22:04:23 UTC (rev 175579)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-04 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OSX] CJK characters styled with font-family: cursive are italicized
+ https://bugs.webkit.org/show_bug.cgi?id=138328
+ rdar://problem/18801907
+
+ Reviewed by Simon Fraser.
+
+ Make sure that the text matches the output of a different codepath.
+
+ * platform/mac/fast/text/font-cursive-italic-cjk-expected.html: Added.
+ * platform/mac/fast/text/font-cursive-italic-cjk.html: Added.
+ * platform/mac/TestExpectations: Skipped test on non-Yosemite platforms.
+
</ins><span class="cx"> 2014-11-04 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> When computing the specificity of selectors, use saturated arithmetic per component
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (175578 => 175579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations        2014-11-04 22:03:20 UTC (rev 175578)
+++ trunk/LayoutTests/platform/mac/TestExpectations        2014-11-04 22:04:23 UTC (rev 175579)
</span><span class="lines">@@ -1505,3 +1505,6 @@
</span><span class="cx"> webkit.org/b/137882 http/tests/media/hls/video-controls-live-stream.html [ Failure ]
</span><span class="cx"> webkit.org/b/137882 http/tests/media/track-in-band-hls-metadata.html [ Failure ]
</span><span class="cx"> webkit.org/b/137882 media/track/audio-track.html [ Pass Failure ]
</span><ins>+
+# Specific to Yosemite's font fallback
+webkit.org/b/138328 [ Mavericks MountainLion ] platform/mac/fast/text/font-cursive-italic-cjk.html [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextfontcursiveitaliccjkexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk-expected.html (0 => 175579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk-expected.html         (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk-expected.html        2014-11-04 22:04:23 UTC (rev 175579)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test makes sure that CJK characters styled with font-family: cursive aren't italicized.
+<div>
+<span style="font-size: 50px;">Look at this character: </span><span style="font-family: STKaiti;">年</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextfontcursiveitaliccjkhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk.html (0 => 175579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk.html         (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/font-cursive-italic-cjk.html        2014-11-04 22:04:23 UTC (rev 175579)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test makes sure that CJK characters styled with font-family: cursive aren't italicized.
+<div>
+<span style="font-size: 50px;">Look at this character: </span><span style="font-family: cursive;">年</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175578 => 175579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-11-04 22:03:20 UTC (rev 175578)
+++ trunk/Source/WebCore/ChangeLog        2014-11-04 22:04:23 UTC (rev 175579)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-04 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OSX] CJK characters styled with font-family: cursive are italicized
+ https://bugs.webkit.org/show_bug.cgi?id=138328
+ rdar://problem/18801907
+
+ Reviewed by Simon Fraser.
+
+ FontCache::createFontPlatformData doesn’t set the oblique flag if
+ the requested font isn’t oblique, but
+ FontCache::systemFallbackForCharacters() does. This patch simply
+ adopts this behavior in both places.
+
+ Test: fast/text/font-cursive-italic-cjk.html
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::FontCache::systemFallbackForCharacters):
+
</ins><span class="cx"> 2014-11-04 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> When computing the specificity of selectors, use saturated arithmetic per component
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (175578 => 175579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm        2014-11-04 22:03:20 UTC (rev 175578)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm        2014-11-04 22:04:23 UTC (rev 175579)
</span><span class="lines">@@ -134,12 +134,13 @@
</span><span class="cx">
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx">
</span><del>- NSFontTraitMask traits;
</del><ins>+ NSFontTraitMask traits = 0;
</ins><span class="cx"> NSInteger weight;
</span><span class="cx"> CGFloat size;
</span><span class="cx">
</span><span class="cx"> if (nsFont) {
</span><del>- traits = [fontManager traitsOfFont:nsFont];
</del><ins>+ if (description.italic())
+ traits = [fontManager traitsOfFont:nsFont];
</ins><span class="cx"> if (platformData.m_syntheticBold)
</span><span class="cx"> traits |= NSBoldFontMask;
</span><span class="cx"> if (platformData.m_syntheticOblique)
</span></span></pre>
</div>
</div>
</body>
</html>