<!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>[195150] 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/195150">195150</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-01-15 14:58:45 -0800 (Fri, 15 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Cocoa] Font features are not applied to the system font
https://bugs.webkit.org/show_bug.cgi?id=153053

Reviewed by Dean Jackson.

Source/WebCore:

We simply need to call preparePlatformFont() on it.

Test: fast/text/system-font-features.html

* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::fontWithFamily):

LayoutTests:

* fast/text/system-font-features-expected.html: Added.
* fast/text/system-font-features.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsystemfontfeaturesexpectedhtml">trunk/LayoutTests/fast/text/system-font-features-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontfeatureshtml">trunk/LayoutTests/fast/text/system-font-features.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195149 => 195150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-15 22:29:19 UTC (rev 195149)
+++ trunk/LayoutTests/ChangeLog        2016-01-15 22:58:45 UTC (rev 195150)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-15  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Cocoa] Font features are not applied to the system font
+        https://bugs.webkit.org/show_bug.cgi?id=153053
+
+        Reviewed by Dean Jackson.
+
+        * fast/text/system-font-features-expected.html: Added.
+        * fast/text/system-font-features.html: Added.
+
</ins><span class="cx"> 2016-01-15  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Media Query (-webkit-video-playable-inline) is failing as an invalid media query expression
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontfeaturesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/system-font-features-expected.html (0 => 195150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-features-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/system-font-features-expected.html        2016-01-15 22:58:45 UTC (rev 195150)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test makes sure that font features are applied to -apple-system.
+&lt;div style=&quot;font: 50px -apple-system-monospaced-numbers;&quot;&gt;0123456789&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontfeatureshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/system-font-features.html (0 => 195150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-features.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/system-font-features.html        2016-01-15 22:58:45 UTC (rev 195150)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test makes sure that font features are applied to -apple-system.
+&lt;div style=&quot;font: 50px -apple-system; font-variant-numeric: tabular-nums;&quot;&gt;0123456789&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195149 => 195150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-15 22:29:19 UTC (rev 195149)
+++ trunk/Source/WebCore/ChangeLog        2016-01-15 22:58:45 UTC (rev 195150)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-15  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Cocoa] Font features are not applied to the system font
+        https://bugs.webkit.org/show_bug.cgi?id=153053
+
+        Reviewed by Dean Jackson.
+
+        We simply need to call preparePlatformFont() on it.
+
+        Test: fast/text/system-font-features.html
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::fontWithFamily):
+
</ins><span class="cx"> 2016-01-15  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Data detector yellow highlight location is vertically mirrored in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (195149 => 195150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp        2016-01-15 22:29:19 UTC (rev 195149)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp        2016-01-15 22:58:45 UTC (rev 195150)
</span><span class="lines">@@ -676,15 +676,15 @@
</span><span class="cx"> {
</span><span class="cx">     if (family.isEmpty())
</span><span class="cx">         return nullptr;
</span><del>-    if (auto specialCase = platformFontWithFamilySpecialCase(family, weight, desiredTraits, size))
-        return specialCase;
</del><ins>+
+    RetainPtr&lt;CTFontRef&gt; foundFont = platformFontWithFamilySpecialCase(family, weight, desiredTraits, size);
+    if (!foundFont) {
</ins><span class="cx"> #if ENABLE(PLATFORM_FONT_LOOKUP)
</span><del>-    RetainPtr&lt;CTFontRef&gt; foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
</del><ins>+        foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
</ins><span class="cx"> #else
</span><del>-    UNUSED_PARAM(featureSettings);
-    UNUSED_PARAM(variantSettings);
-    RetainPtr&lt;CTFontRef&gt; foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
</del><ins>+        foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
</ins><span class="cx"> #endif
</span><ins>+    }
</ins><span class="cx">     return preparePlatformFont(foundFont.get(), textRenderingMode, nullptr, nullptr, featureSettings, variantSettings);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>