<!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>[194114] 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/194114">194114</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-12-15 13:55:34 -0800 (Tue, 15 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Font Features] TrueType fonts trigger real features even when synthesis is applied
https://bugs.webkit.org/show_bug.cgi?id=152287

Reviewed by Darin Adler.

Source/WebCore:

When using a font feature that is synthesizable, and synthesis is triggered,
we should make sure to turn off the original font feature. Otherwise, the
feature will be applied twice on top of itself.

This worked for OpenType fonts, but not for TrueType fonts.

Tests: css3/font-variant-petite-caps-synthesis.html
       css3/font-variant-small-caps-synthesis.html
       css3/font-variant-petite-caps-synthesis-coverage.html
       css3/font-variant-small-caps-synthesis-coverage.html

* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::defaultSelectorForTrueTypeFeature):
(WebCore::removedFeature):
(WebCore::createCTFontWithoutSynthesizableFeatures):

LayoutTests:

Adding tests.

* css3/font-variant-petite-caps-synthesis-expected.html:
* css3/font-variant-petite-caps-synthesis.html:
* css3/font-variant-small-caps-synthesis-expected.html:
* css3/font-variant-small-caps-synthesis.html:
* css3/font-variant-petite-caps-synthesis-coverage-expected.html:
* css3/font-variant-petite-caps-synthesis-coverage.html:
* css3/font-variant-small-caps-synthesis-coverage-expected.html:
* css3/font-variant-small-caps-synthesis-coverage.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantpetitecapssynthesiscoverageexpectedhtml">trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantpetitecapssynthesiscoveragehtml">trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantpetitecapssynthesisexpectedhtml">trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantpetitecapssynthesishtml">trunk/LayoutTests/css3/font-variant-petite-caps-synthesis.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantsmallcapssynthesiscoverageexpectedhtml">trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantsmallcapssynthesiscoveragehtml">trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantsmallcapssynthesisexpectedhtml">trunk/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantsmallcapssynthesishtml">trunk/LayoutTests/css3/font-variant-small-caps-synthesis.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/ChangeLog        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-15  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Font Features] TrueType fonts trigger real features even when synthesis is applied
+        https://bugs.webkit.org/show_bug.cgi?id=152287
+
+        Reviewed by Darin Adler.
+
+        Adding tests.
+
+        * css3/font-variant-petite-caps-synthesis-expected.html:
+        * css3/font-variant-petite-caps-synthesis.html:
+        * css3/font-variant-small-caps-synthesis-expected.html:
+        * css3/font-variant-small-caps-synthesis.html:
+        * css3/font-variant-petite-caps-synthesis-coverage-expected.html:
+        * css3/font-variant-petite-caps-synthesis-coverage.html:
+        * css3/font-variant-small-caps-synthesis-coverage-expected.html:
+        * css3/font-variant-small-caps-synthesis-coverage.html:
+
</ins><span class="cx"> 2015-12-15  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Polymorphic operand types for DFG and FTL bit operators.
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantpetitecapssynthesiscoverageexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid black 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;K&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;K&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
</span><span class="lines">@@ -54,6 +71,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantpetitecapssynthesiscoveragehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -7,6 +7,12 @@
</span><span class="cx">     font-family: &quot;testfontotf&quot;;
</span><span class="cx">     src: url(&quot;resources/FontWithFeatures.otf&quot;) format(&quot;opentype&quot;);
</span><span class="cx"> }
</span><ins>+@font-face {
+    /* Truetype. &quot;S&quot; responds to smcp; &quot;V&quot; responds to c2sc */
+    /* Truetype. &quot;T&quot; responds to smcp; &quot;W&quot; responds to c2sc */
+    font-family: &quot;testfontttf&quot;;
+    src: url(&quot;resources/FontWithFeatures.ttf&quot;) format(&quot;truetype&quot;);
+}
</ins><span class="cx"> .test {
</span><span class="cx">     font-size: 20px;
</span><span class="cx">     display: inline-block;
</span><span class="lines">@@ -42,6 +48,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;AM&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;MA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;T&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;W&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;T&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;aT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;Ta&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;AT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;TA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;W&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;aW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;Wa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;AW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;WA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;a&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;L&lt;/div&gt;
</span><span class="lines">@@ -55,6 +78,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;AM&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;MA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;T&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;aT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;Ta&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;AT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;TA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;W&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;aW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;Wa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;AW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;WA&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantpetitecapssynthesisexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid black 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;K&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;K&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="lines">@@ -54,6 +71,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantpetitecapssynthesishtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-petite-caps-synthesis.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-petite-caps-synthesis.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-petite-caps-synthesis.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -7,6 +7,12 @@
</span><span class="cx">     font-family: &quot;testfontotf&quot;;
</span><span class="cx">     src: url(&quot;resources/FontWithFeatures.otf&quot;) format(&quot;opentype&quot;);
</span><span class="cx"> }
</span><ins>+@font-face {
+    /* Truetype. &quot;S&quot; responds to smcp; &quot;V&quot; responds to c2sc */
+    /* Truetype. &quot;T&quot; responds to smcp; &quot;W&quot; responds to c2sc */
+    font-family: &quot;testfontttf&quot;;
+    src: url(&quot;resources/FontWithFeatures.ttf&quot;) format(&quot;truetype&quot;);
+}
</ins><span class="cx"> .test {
</span><span class="cx">     font-size: 20px;
</span><span class="cx">     display: inline-block;
</span><span class="lines">@@ -42,6 +48,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;AM&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;MA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;T&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;W&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;T&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;aT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;Ta&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;AT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;TA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;W&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;aW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;Wa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;AW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: petite-caps;&quot;&gt;WA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;a&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;L&lt;/div&gt;
</span><span class="lines">@@ -55,6 +78,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;AM&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;MA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;T&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;aT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;Ta&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;AT&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;TA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;W&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;aW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;Wa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;AW&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-petite-caps;&quot;&gt;WA&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantsmallcapssynthesiscoverageexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid black 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;K&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;K&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid red 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;style=&quot;&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
</span><span class="lines">@@ -60,6 +77,25 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;A&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;A&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid red 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;style=&quot;&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;A&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
</span><span class="lines">@@ -73,6 +109,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid green 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
</span><span class="lines">@@ -86,6 +135,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid green 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantsmallcapssynthesiscoveragehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -9,10 +9,20 @@
</span><span class="cx">     src: url(&quot;resources/FontWithFeatures.otf&quot;) format(&quot;opentype&quot;);
</span><span class="cx"> }
</span><span class="cx"> @font-face {
</span><ins>+    /* Truetype. &quot;S&quot; responds to smcp; &quot;V&quot; responds to c2sc */
+    font-family: &quot;testfontttf&quot;;
+    src: url(&quot;resources/FontWithFeatures.ttf&quot;) format(&quot;truetype&quot;);
+}
+@font-face {
</ins><span class="cx">     /* Opentype. &quot;f&quot; responds to smcp; &quot;g&quot; responds to c2sc */
</span><span class="cx">     font-family: &quot;testfontlowercasesmallcapsotf&quot;;
</span><span class="cx">     src: url(&quot;resources/FontWithFeaturesLowercaseSmallCaps.otf&quot;) format(&quot;opentype&quot;);
</span><span class="cx"> }
</span><ins>+@font-face {
+    /* Truetype. &quot;r&quot; responds to smcp; &quot;u&quot; responds to c2sc */
+    font-family: &quot;testfontlowercasesmallcapsttf&quot;;
+    src: url(&quot;resources/FontWithFeaturesLowercaseSmallCaps.ttf&quot;) format(&quot;truetype&quot;);
+}
</ins><span class="cx"> .test {
</span><span class="cx">     font-size: 20px;
</span><span class="cx">     display: inline-block;
</span><span class="lines">@@ -48,6 +58,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;AK&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;KA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;S&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;V&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;S&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;aS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Sa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;AS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;SA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;V&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;aV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Va&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;AV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;VA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontlowercasesmallcapsotf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
</span><span class="lines">@@ -67,6 +94,25 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Ag&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;gA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontlowercasesmallcapsttf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;r&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;u&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;R&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;U&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;r&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;ra&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;rA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;u&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;ua&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;uA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;J&lt;/div&gt;
</span><span class="lines">@@ -80,6 +126,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;AK&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;KA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;S&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;aS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Sa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;AS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;SA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;V&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;aV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Va&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;AV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;VA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontlowercasesmallcapsotf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;f&lt;/div&gt;
</span><span class="lines">@@ -91,8 +150,21 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ag&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ga&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Ag&lt;/div&gt;
</span><del>-&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;gA&lt;/div
</del><ins>+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;gA&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontlowercasesmallcapsttf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;r&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ra&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;rA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;u&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ua&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;uA&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantsmallcapssynthesisexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid black 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AA&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;K&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;K&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;BA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid red 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;style=&quot;&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
</span><span class="lines">@@ -60,6 +77,25 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;A&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;A&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid red 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;style=&quot;&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;B&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;A&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;A&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;A&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="lines">@@ -73,6 +109,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid blue 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfont; border: solid green 1px; margin: 5px;&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
</span><span class="lines">@@ -86,6 +135,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfont; border: solid green 1px; margin: 5px;&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;B&lt;/span&gt;&lt;span style=&quot;font-size: 14px;&quot;&gt;A&lt;/span&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantsmallcapssynthesishtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-small-caps-synthesis.html (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-small-caps-synthesis.html        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/LayoutTests/css3/font-variant-small-caps-synthesis.html        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -9,10 +9,20 @@
</span><span class="cx">     src: url(&quot;resources/FontWithFeatures.otf&quot;) format(&quot;opentype&quot;);
</span><span class="cx"> }
</span><span class="cx"> @font-face {
</span><ins>+    /* Truetype. &quot;S&quot; responds to smcp; &quot;V&quot; responds to c2sc */
+    font-family: &quot;testfontttf&quot;;
+    src: url(&quot;resources/FontWithFeatures.ttf&quot;) format(&quot;truetype&quot;);
+}
+@font-face {
</ins><span class="cx">     /* Opentype. &quot;f&quot; responds to smcp; &quot;g&quot; responds to c2sc */
</span><span class="cx">     font-family: &quot;testfontlowercasesmallcapsotf&quot;;
</span><span class="cx">     src: url(&quot;resources/FontWithFeaturesLowercaseSmallCaps.otf&quot;) format(&quot;opentype&quot;);
</span><span class="cx"> }
</span><ins>+@font-face {
+    /* Truetype. &quot;r&quot; responds to smcp; &quot;u&quot; responds to c2sc */
+    font-family: &quot;testfontlowercasesmallcapsttf&quot;;
+    src: url(&quot;resources/FontWithFeaturesLowercaseSmallCaps.ttf&quot;) format(&quot;truetype&quot;);
+}
</ins><span class="cx"> .test {
</span><span class="cx">     font-size: 20px;
</span><span class="cx">     display: inline-block;
</span><span class="lines">@@ -48,6 +58,23 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;AK&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;KA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;S&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;V&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;S&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;aS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Sa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;AS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;SA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;V&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;aV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Va&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;AV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;VA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontlowercasesmallcapsotf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
</span><span class="lines">@@ -67,6 +94,25 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Ag&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;gA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontlowercasesmallcapsttf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot;&gt;AB&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;r&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;u&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;R&lt;/div&gt;
+&lt;div class=&quot;test&quot;&gt;U&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;r&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;ra&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;rA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;u&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;ua&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;Au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: small-caps;&quot;&gt;uA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;J&lt;/div&gt;
</span><span class="lines">@@ -80,6 +126,19 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;AK&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;KA&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;S&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;aS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Sa&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;AS&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;SA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;V&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;aV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Va&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;AV&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;VA&lt;/div&gt;
+&lt;/div&gt;
</ins><span class="cx"> &lt;div style=&quot;font-family: testfontlowercasesmallcapsotf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;f&lt;/div&gt;
</span><span class="lines">@@ -91,8 +150,21 @@
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ag&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ga&lt;/div&gt;
</span><span class="cx"> &lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Ag&lt;/div&gt;
</span><del>-&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;gA&lt;/div
</del><ins>+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;gA&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;div style=&quot;font-family: testfontlowercasesmallcapsttf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';&quot;&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;a&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;r&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ra&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Ar&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;rA&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;u&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;ua&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;Au&lt;/div&gt;
+&lt;div class=&quot;test&quot; style=&quot;font-variant-caps: all-small-caps;&quot;&gt;uA&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><ins>+&lt;/div&gt;
</ins><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/Source/WebCore/ChangeLog        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-15  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [Font Features] TrueType fonts trigger real features even when synthesis is applied
+        https://bugs.webkit.org/show_bug.cgi?id=152287
+
+        Reviewed by Darin Adler.
+
+        When using a font feature that is synthesizable, and synthesis is triggered,
+        we should make sure to turn off the original font feature. Otherwise, the
+        feature will be applied twice on top of itself.
+
+        This worked for OpenType fonts, but not for TrueType fonts.
+
+        Tests: css3/font-variant-petite-caps-synthesis.html
+               css3/font-variant-small-caps-synthesis.html
+               css3/font-variant-petite-caps-synthesis-coverage.html
+               css3/font-variant-small-caps-synthesis-coverage.html
+
+        * platform/graphics/cocoa/FontCocoa.mm:
+        (WebCore::defaultSelectorForTrueTypeFeature):
+        (WebCore::removedFeature):
+        (WebCore::createCTFontWithoutSynthesizableFeatures):
+
</ins><span class="cx"> 2015-12-15  Per Arne Vollan  &lt;peavo@outlook.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WinCairo][MediaFoundation] Full screen mode is not supported.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (194113 => 194114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm        2015-12-15 21:19:31 UTC (rev 194113)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm        2015-12-15 21:55:34 UTC (rev 194114)
</span><span class="lines">@@ -469,8 +469,41 @@
</span><span class="cx">     return std::make_pair(rawType, rawSelector);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static inline RetainPtr&lt;CFDictionaryRef&gt; removedFeature(CFDictionaryRef feature)
</del><ins>+static inline CFNumberRef defaultSelectorForTrueTypeFeature(int key, CTFontRef font)
</ins><span class="cx"> {
</span><ins>+    RetainPtr&lt;CFArrayRef&gt; features = adoptCF(CTFontCopyFeatures(font));
+    CFIndex featureCount = CFArrayGetCount(features.get());
+    for (CFIndex i = 0; i &lt; featureCount; ++i) {
+        CFDictionaryRef featureType = static_cast&lt;CFDictionaryRef&gt;(CFArrayGetValueAtIndex(features.get(), i));
+        CFNumberRef featureKey = static_cast&lt;CFNumberRef&gt;(CFDictionaryGetValue(featureType, kCTFontFeatureTypeIdentifierKey));
+        if (!featureKey)
+            continue;
+        int rawFeatureKey;
+        CFNumberGetValue(featureKey, kCFNumberIntType, &amp;rawFeatureKey);
+        if (rawFeatureKey != key)
+            continue;
+
+        CFArrayRef featureSelectors = static_cast&lt;CFArrayRef&gt;(CFDictionaryGetValue(featureType, kCTFontFeatureTypeSelectorsKey));
+        if (!featureSelectors)
+            continue;
+        CFIndex selectorsCount = CFArrayGetCount(featureSelectors);
+        for (CFIndex j = 0; j &lt; selectorsCount; ++j) {
+            CFDictionaryRef featureSelector = static_cast&lt;CFDictionaryRef&gt;(CFArrayGetValueAtIndex(featureSelectors, j));
+            CFNumberRef isDefault = static_cast&lt;CFNumberRef&gt;(CFDictionaryGetValue(featureSelector, kCTFontFeatureSelectorDefaultKey));
+            if (!isDefault)
+                continue;
+            int rawIsDefault;
+            CFNumberGetValue(isDefault, kCFNumberIntType, &amp;rawIsDefault);
+            if (!rawIsDefault)
+                continue;
+            return static_cast&lt;CFNumberRef&gt;(CFDictionaryGetValue(featureSelector, kCTFontFeatureSelectorIdentifierKey));
+        }
+    }
+    return nullptr;
+}
+
+static inline RetainPtr&lt;CFDictionaryRef&gt; removedFeature(CFDictionaryRef feature, CTFontRef font)
+{
</ins><span class="cx">     bool isOpenType = isOpenTypeFeature(feature);
</span><span class="cx">     bool isTrueType = isTrueTypeFeature(feature);
</span><span class="cx">     if (!isOpenType &amp;&amp; !isTrueType)
</span><span class="lines">@@ -494,15 +527,17 @@
</span><span class="cx">     if (isTrueType) {
</span><span class="cx">         auto trueTypeFeaturePair = trueTypeFeature(feature);
</span><span class="cx">         if (trueTypeFeaturePair.first == kLowerCaseType &amp;&amp; (trueTypeFeaturePair.second == kLowerCaseSmallCapsSelector || trueTypeFeaturePair.second == kLowerCasePetiteCapsSelector)) {
</span><del>-            int rawSelector = kDefaultLowerCaseSelector;
-            RetainPtr&lt;CFNumberRef&gt; selector = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &amp;rawSelector));
</del><span class="cx">             CFDictionaryAddValue(result.get(), kCTFontFeatureTypeIdentifierKey, CFDictionaryGetValue(feature, kCTFontFeatureTypeIdentifierKey));
</span><del>-            CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, selector.get());
</del><ins>+            if (CFNumberRef defaultSelector = defaultSelectorForTrueTypeFeature(kLowerCaseType, font))
+                CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, defaultSelector);
+            else
+                CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, CFDictionaryGetValue(feature, kCTFontFeatureSelectorIdentifierKey));
</ins><span class="cx">         } else if (trueTypeFeaturePair.first == kUpperCaseType &amp;&amp; (trueTypeFeaturePair.second == kUpperCaseSmallCapsSelector || trueTypeFeaturePair.second == kUpperCasePetiteCapsSelector)) {
</span><del>-            int rawSelector = kDefaultUpperCaseSelector;
-            RetainPtr&lt;CFNumberRef&gt; selector = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &amp;rawSelector));
</del><span class="cx">             CFDictionaryAddValue(result.get(), kCTFontFeatureTypeIdentifierKey, CFDictionaryGetValue(feature, kCTFontFeatureTypeIdentifierKey));
</span><del>-            CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, selector.get());
</del><ins>+            if (CFNumberRef defaultSelector = defaultSelectorForTrueTypeFeature(kUpperCaseType, font))
+                CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, defaultSelector);
+            else
+                CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, CFDictionaryGetValue(feature, kCTFontFeatureSelectorIdentifierKey));
</ins><span class="cx">         } else {
</span><span class="cx">             CFDictionaryAddValue(result.get(), kCTFontFeatureTypeIdentifierKey, CFDictionaryGetValue(feature, kCTFontFeatureTypeIdentifierKey));
</span><span class="cx">             CFDictionaryAddValue(result.get(), kCTFontFeatureSelectorIdentifierKey, CFDictionaryGetValue(feature, kCTFontFeatureSelectorIdentifierKey));
</span><span class="lines">@@ -520,7 +555,7 @@
</span><span class="cx">     RetainPtr&lt;CFMutableArrayRef&gt; newFeatures = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, featureCount, &amp;kCFTypeArrayCallBacks));
</span><span class="cx">     for (CFIndex i = 0; i &lt; featureCount; ++i) {
</span><span class="cx">         CFDictionaryRef feature = static_cast&lt;CFDictionaryRef&gt;(CFArrayGetValueAtIndex(features.get(), i));
</span><del>-        CFArrayAppendValue(newFeatures.get(), removedFeature(feature).get());
</del><ins>+        CFArrayAppendValue(newFeatures.get(), removedFeature(feature, font).get());
</ins><span class="cx">     }
</span><span class="cx">     CFTypeRef keys[] = { kCTFontFeatureSettingsAttribute };
</span><span class="cx">     CFTypeRef values[] = { newFeatures.get() };
</span></span></pre>
</div>
</div>

</body>
</html>