<!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>[194350] branches/safari-601.1.46-branch</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/194350">194350</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-21 14:27:59 -0800 (Mon, 21 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/194114">r194114</a>. rdar://problem/23978924</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesiscoverageexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesiscoveragehtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesisexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesishtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesiscoverageexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesiscoveragehtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesisexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesishtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis.html</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscocoaFontCocoamm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-12-21 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r194114.
+
+ 2015-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [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-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r194246. rdar://problem/23824469
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesiscoverageexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage-expected.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> <div class="test">AB</div>
</span><span class="cx"> <div class="test">BA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid black 1px; margin: 5px;">
+<div class="test">AB</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span>B</div>
+<div class="test">B<span style="font-size: 14px;">A</span></div>
+<div class="test">AA</div>
+<div class="test">AA</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span>K</div>
+<div class="test">K<span style="font-size: 14px;">A</span></div>
+<div class="test">AB</div>
+<div class="test">BA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test">A</div>
</span><span class="lines">@@ -54,6 +71,19 @@
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesiscoveragehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-coverage.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -7,6 +7,12 @@
</span><span class="cx"> font-family: "testfontotf";
</span><span class="cx"> src: url("resources/FontWithFeatures.otf") format("opentype");
</span><span class="cx"> }
</span><ins>+@font-face {
+ /* Truetype. "S" responds to smcp; "V" responds to c2sc */
+ /* Truetype. "T" responds to smcp; "W" responds to c2sc */
+ font-family: "testfontttf";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
</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"> <div class="test" style="font-variant-caps: petite-caps;">AM</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: petite-caps;">MA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test">AB</div>
+<div class="test">a</div>
+<div class="test">T</div>
+<div class="test">W</div>
+<div class="test" style="font-variant-caps: petite-caps;">a</div>
+<div class="test" style="font-variant-caps: petite-caps;">T</div>
+<div class="test" style="font-variant-caps: petite-caps;">aT</div>
+<div class="test" style="font-variant-caps: petite-caps;">Ta</div>
+<div class="test" style="font-variant-caps: petite-caps;">AT</div>
+<div class="test" style="font-variant-caps: petite-caps;">TA</div>
+<div class="test" style="font-variant-caps: petite-caps;">W</div>
+<div class="test" style="font-variant-caps: petite-caps;">aW</div>
+<div class="test" style="font-variant-caps: petite-caps;">Wa</div>
+<div class="test" style="font-variant-caps: petite-caps;">AW</div>
+<div class="test" style="font-variant-caps: petite-caps;">WA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">a</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">L</div>
</span><span class="lines">@@ -55,6 +78,19 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">AM</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">MA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test" style="font-variant-caps: all-petite-caps;">a</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">T</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">aT</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">Ta</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">AT</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">TA</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">W</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">aW</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">Wa</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">AW</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">WA</div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesisexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis-expected.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> <div class="test">AB</div>
</span><span class="cx"> <div class="test">BA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid black 1px; margin: 5px;">
+<div class="test">AB</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span>B</div>
+<div class="test">B<span style="font-size: 14px;">A</span></div>
+<div class="test">AA</div>
+<div class="test">AA</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span>K</div>
+<div class="test">K<span style="font-size: 14px;">A</span></div>
+<div class="test">AB</div>
+<div class="test">BA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span></div>
</span><span class="lines">@@ -54,6 +71,19 @@
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantpetitecapssynthesishtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-petite-caps-synthesis.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -7,6 +7,12 @@
</span><span class="cx"> font-family: "testfontotf";
</span><span class="cx"> src: url("resources/FontWithFeatures.otf") format("opentype");
</span><span class="cx"> }
</span><ins>+@font-face {
+ /* Truetype. "S" responds to smcp; "V" responds to c2sc */
+ /* Truetype. "T" responds to smcp; "W" responds to c2sc */
+ font-family: "testfontttf";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
</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"> <div class="test" style="font-variant-caps: petite-caps;">AM</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: petite-caps;">MA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test">AB</div>
+<div class="test">a</div>
+<div class="test">T</div>
+<div class="test">W</div>
+<div class="test" style="font-variant-caps: petite-caps;">a</div>
+<div class="test" style="font-variant-caps: petite-caps;">T</div>
+<div class="test" style="font-variant-caps: petite-caps;">aT</div>
+<div class="test" style="font-variant-caps: petite-caps;">Ta</div>
+<div class="test" style="font-variant-caps: petite-caps;">AT</div>
+<div class="test" style="font-variant-caps: petite-caps;">TA</div>
+<div class="test" style="font-variant-caps: petite-caps;">W</div>
+<div class="test" style="font-variant-caps: petite-caps;">aW</div>
+<div class="test" style="font-variant-caps: petite-caps;">Wa</div>
+<div class="test" style="font-variant-caps: petite-caps;">AW</div>
+<div class="test" style="font-variant-caps: petite-caps;">WA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">a</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">L</div>
</span><span class="lines">@@ -55,6 +78,19 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">AM</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-petite-caps;">MA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test" style="font-variant-caps: all-petite-caps;">a</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">T</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">aT</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">Ta</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">AT</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">TA</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">W</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">aW</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">Wa</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">AW</div>
+<div class="test" style="font-variant-caps: all-petite-caps;">WA</div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesiscoverageexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage-expected.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> <div class="test">AB</div>
</span><span class="cx"> <div class="test">BA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid black 1px; margin: 5px;">
+<div class="test">AB</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span>B</div>
+<div class="test">B<span style="font-size: 14px;">A</span></div>
+<div class="test">AA</div>
+<div class="test">AA</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span>K</div>
+<div class="test">K<span style="font-size: 14px;">A</span></div>
+<div class="test">AB</div>
+<div class="test">BA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid red 1px; margin: 5px;">
</span><span class="cx"> <div class="test"style="">AB</div>
</span><span class="cx"> <div class="test">B</div>
</span><span class="lines">@@ -60,6 +77,25 @@
</span><span class="cx"> <div class="test">A<span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span>A</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid red 1px; margin: 5px;">
+<div class="test"style="">AB</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">A</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test">AA</div>
+<div class="test">AA</div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test">A<span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span>A</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test">A</div>
</span><span class="lines">@@ -73,6 +109,19 @@
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid green 1px; margin: 5px;">
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test">A</div>
</span><span class="lines">@@ -86,6 +135,19 @@
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid green 1px; margin: 5px;">
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesiscoveragehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-coverage.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -9,10 +9,20 @@
</span><span class="cx"> src: url("resources/FontWithFeatures.otf") format("opentype");
</span><span class="cx"> }
</span><span class="cx"> @font-face {
</span><ins>+ /* Truetype. "S" responds to smcp; "V" responds to c2sc */
+ font-family: "testfontttf";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+@font-face {
</ins><span class="cx"> /* Opentype. "f" responds to smcp; "g" responds to c2sc */
</span><span class="cx"> font-family: "testfontlowercasesmallcapsotf";
</span><span class="cx"> src: url("resources/FontWithFeaturesLowercaseSmallCaps.otf") format("opentype");
</span><span class="cx"> }
</span><ins>+@font-face {
+ /* Truetype. "r" responds to smcp; "u" responds to c2sc */
+ font-family: "testfontlowercasesmallcapsttf";
+ src: url("resources/FontWithFeaturesLowercaseSmallCaps.ttf") format("truetype");
+}
</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"> <div class="test" style="font-variant-caps: small-caps;">AK</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: small-caps;">KA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test">AB</div>
+<div class="test">a</div>
+<div class="test">S</div>
+<div class="test">V</div>
+<div class="test" style="font-variant-caps: small-caps;">a</div>
+<div class="test" style="font-variant-caps: small-caps;">S</div>
+<div class="test" style="font-variant-caps: small-caps;">aS</div>
+<div class="test" style="font-variant-caps: small-caps;">Sa</div>
+<div class="test" style="font-variant-caps: small-caps;">AS</div>
+<div class="test" style="font-variant-caps: small-caps;">SA</div>
+<div class="test" style="font-variant-caps: small-caps;">V</div>
+<div class="test" style="font-variant-caps: small-caps;">aV</div>
+<div class="test" style="font-variant-caps: small-caps;">Va</div>
+<div class="test" style="font-variant-caps: small-caps;">AV</div>
+<div class="test" style="font-variant-caps: small-caps;">VA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontlowercasesmallcapsotf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test">AB</div>
</span><span class="cx"> <div class="test">a</div>
</span><span class="lines">@@ -67,6 +94,25 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: small-caps;">Ag</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: small-caps;">gA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontlowercasesmallcapsttf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test">AB</div>
+<div class="test">a</div>
+<div class="test">r</div>
+<div class="test">u</div>
+<div class="test">R</div>
+<div class="test">U</div>
+<div class="test" style="font-variant-caps: small-caps;">a</div>
+<div class="test" style="font-variant-caps: small-caps;">r</div>
+<div class="test" style="font-variant-caps: small-caps;">ar</div>
+<div class="test" style="font-variant-caps: small-caps;">ra</div>
+<div class="test" style="font-variant-caps: small-caps;">Ar</div>
+<div class="test" style="font-variant-caps: small-caps;">rA</div>
+<div class="test" style="font-variant-caps: small-caps;">u</div>
+<div class="test" style="font-variant-caps: small-caps;">au</div>
+<div class="test" style="font-variant-caps: small-caps;">ua</div>
+<div class="test" style="font-variant-caps: small-caps;">Au</div>
+<div class="test" style="font-variant-caps: small-caps;">uA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">a</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">J</div>
</span><span class="lines">@@ -80,6 +126,19 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">AK</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">KA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test" style="font-variant-caps: all-small-caps;">a</div>
+<div class="test" style="font-variant-caps: all-small-caps;">S</div>
+<div class="test" style="font-variant-caps: all-small-caps;">aS</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Sa</div>
+<div class="test" style="font-variant-caps: all-small-caps;">AS</div>
+<div class="test" style="font-variant-caps: all-small-caps;">SA</div>
+<div class="test" style="font-variant-caps: all-small-caps;">V</div>
+<div class="test" style="font-variant-caps: all-small-caps;">aV</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Va</div>
+<div class="test" style="font-variant-caps: all-small-caps;">AV</div>
+<div class="test" style="font-variant-caps: all-small-caps;">VA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontlowercasesmallcapsotf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">a</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">f</div>
</span><span class="lines">@@ -91,8 +150,21 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">ag</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">ga</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">Ag</div>
</span><del>-<div class="test" style="font-variant-caps: all-small-caps;">gA</div
</del><ins>+<div class="test" style="font-variant-caps: all-small-caps;">gA</div>
</ins><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontlowercasesmallcapsttf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test" style="font-variant-caps: all-small-caps;">a</div>
+<div class="test" style="font-variant-caps: all-small-caps;">r</div>
+<div class="test" style="font-variant-caps: all-small-caps;">ar</div>
+<div class="test" style="font-variant-caps: all-small-caps;">ra</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Ar</div>
+<div class="test" style="font-variant-caps: all-small-caps;">rA</div>
+<div class="test" style="font-variant-caps: all-small-caps;">u</div>
+<div class="test" style="font-variant-caps: all-small-caps;">au</div>
+<div class="test" style="font-variant-caps: all-small-caps;">ua</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Au</div>
+<div class="test" style="font-variant-caps: all-small-caps;">uA</div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesisexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis-expected.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -41,6 +41,23 @@
</span><span class="cx"> <div class="test">AB</div>
</span><span class="cx"> <div class="test">BA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid black 1px; margin: 5px;">
+<div class="test">AB</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test">A</div>
+<div class="test"><span style="font-size: 14px;">A</span>B</div>
+<div class="test">B<span style="font-size: 14px;">A</span></div>
+<div class="test">AA</div>
+<div class="test">AA</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span>K</div>
+<div class="test">K<span style="font-size: 14px;">A</span></div>
+<div class="test">AB</div>
+<div class="test">BA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid red 1px; margin: 5px;">
</span><span class="cx"> <div class="test"style="">AB</div>
</span><span class="cx"> <div class="test">B</div>
</span><span class="lines">@@ -60,6 +77,25 @@
</span><span class="cx"> <div class="test">A<span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span>A</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid red 1px; margin: 5px;">
+<div class="test"style="">AB</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">B</div>
+<div class="test">A</div>
+<div class="test">B</div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test">A<span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span>A</div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test">A<span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span>A</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span></div>
</span><span class="lines">@@ -73,6 +109,19 @@
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid blue 1px; margin: 5px;">
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+</div>
</ins><span class="cx"> <div style="font-family: testfont; border: solid green 1px; margin: 5px;">
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">B</span></div>
</span><span class="lines">@@ -86,6 +135,19 @@
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> <div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfont; border: solid green 1px; margin: 5px;">
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
+<div class="test"><span style="font-size: 14px;">A</span><span style="font-size: 14px;">B</span></div>
+<div class="test"><span style="font-size: 14px;">B</span><span style="font-size: 14px;">A</span></div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontvariantsmallcapssynthesishtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis.html (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis.html 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-small-caps-synthesis.html 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -9,10 +9,20 @@
</span><span class="cx"> src: url("resources/FontWithFeatures.otf") format("opentype");
</span><span class="cx"> }
</span><span class="cx"> @font-face {
</span><ins>+ /* Truetype. "S" responds to smcp; "V" responds to c2sc */
+ font-family: "testfontttf";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+@font-face {
</ins><span class="cx"> /* Opentype. "f" responds to smcp; "g" responds to c2sc */
</span><span class="cx"> font-family: "testfontlowercasesmallcapsotf";
</span><span class="cx"> src: url("resources/FontWithFeaturesLowercaseSmallCaps.otf") format("opentype");
</span><span class="cx"> }
</span><ins>+@font-face {
+ /* Truetype. "r" responds to smcp; "u" responds to c2sc */
+ font-family: "testfontlowercasesmallcapsttf";
+ src: url("resources/FontWithFeaturesLowercaseSmallCaps.ttf") format("truetype");
+}
</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"> <div class="test" style="font-variant-caps: small-caps;">AK</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: small-caps;">KA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid black 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test">AB</div>
+<div class="test">a</div>
+<div class="test">S</div>
+<div class="test">V</div>
+<div class="test" style="font-variant-caps: small-caps;">a</div>
+<div class="test" style="font-variant-caps: small-caps;">S</div>
+<div class="test" style="font-variant-caps: small-caps;">aS</div>
+<div class="test" style="font-variant-caps: small-caps;">Sa</div>
+<div class="test" style="font-variant-caps: small-caps;">AS</div>
+<div class="test" style="font-variant-caps: small-caps;">SA</div>
+<div class="test" style="font-variant-caps: small-caps;">V</div>
+<div class="test" style="font-variant-caps: small-caps;">aV</div>
+<div class="test" style="font-variant-caps: small-caps;">Va</div>
+<div class="test" style="font-variant-caps: small-caps;">AV</div>
+<div class="test" style="font-variant-caps: small-caps;">VA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontlowercasesmallcapsotf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test">AB</div>
</span><span class="cx"> <div class="test">a</div>
</span><span class="lines">@@ -67,6 +94,25 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: small-caps;">Ag</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: small-caps;">gA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontlowercasesmallcapsttf; border: solid red 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test">AB</div>
+<div class="test">a</div>
+<div class="test">r</div>
+<div class="test">u</div>
+<div class="test">R</div>
+<div class="test">U</div>
+<div class="test" style="font-variant-caps: small-caps;">a</div>
+<div class="test" style="font-variant-caps: small-caps;">r</div>
+<div class="test" style="font-variant-caps: small-caps;">ar</div>
+<div class="test" style="font-variant-caps: small-caps;">ra</div>
+<div class="test" style="font-variant-caps: small-caps;">Ar</div>
+<div class="test" style="font-variant-caps: small-caps;">rA</div>
+<div class="test" style="font-variant-caps: small-caps;">u</div>
+<div class="test" style="font-variant-caps: small-caps;">au</div>
+<div class="test" style="font-variant-caps: small-caps;">ua</div>
+<div class="test" style="font-variant-caps: small-caps;">Au</div>
+<div class="test" style="font-variant-caps: small-caps;">uA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontotf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">a</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">J</div>
</span><span class="lines">@@ -80,6 +126,19 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">AK</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">KA</div>
</span><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontttf; border: solid blue 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test" style="font-variant-caps: all-small-caps;">a</div>
+<div class="test" style="font-variant-caps: all-small-caps;">S</div>
+<div class="test" style="font-variant-caps: all-small-caps;">aS</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Sa</div>
+<div class="test" style="font-variant-caps: all-small-caps;">AS</div>
+<div class="test" style="font-variant-caps: all-small-caps;">SA</div>
+<div class="test" style="font-variant-caps: all-small-caps;">V</div>
+<div class="test" style="font-variant-caps: all-small-caps;">aV</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Va</div>
+<div class="test" style="font-variant-caps: all-small-caps;">AV</div>
+<div class="test" style="font-variant-caps: all-small-caps;">VA</div>
+</div>
</ins><span class="cx"> <div style="font-family: testfontlowercasesmallcapsotf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';">
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">a</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">f</div>
</span><span class="lines">@@ -91,8 +150,21 @@
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">ag</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">ga</div>
</span><span class="cx"> <div class="test" style="font-variant-caps: all-small-caps;">Ag</div>
</span><del>-<div class="test" style="font-variant-caps: all-small-caps;">gA</div
</del><ins>+<div class="test" style="font-variant-caps: all-small-caps;">gA</div>
</ins><span class="cx"> </div>
</span><ins>+<div style="font-family: testfontlowercasesmallcapsttf; border: solid green 1px; margin: 5px; font-feature-settings: 'ntrl';">
+<div class="test" style="font-variant-caps: all-small-caps;">a</div>
+<div class="test" style="font-variant-caps: all-small-caps;">r</div>
+<div class="test" style="font-variant-caps: all-small-caps;">ar</div>
+<div class="test" style="font-variant-caps: all-small-caps;">ra</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Ar</div>
+<div class="test" style="font-variant-caps: all-small-caps;">rA</div>
+<div class="test" style="font-variant-caps: all-small-caps;">u</div>
+<div class="test" style="font-variant-caps: all-small-caps;">au</div>
+<div class="test" style="font-variant-caps: all-small-caps;">ua</div>
+<div class="test" style="font-variant-caps: all-small-caps;">Au</div>
+<div class="test" style="font-variant-caps: all-small-caps;">uA</div>
</ins><span class="cx"> </div>
</span><ins>+</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194114.
+
+ 2015-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [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):
+
+2015-12-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188802.
</span><span class="cx">
</span><span class="cx"> 2015-08-21 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (194349 => 194350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-21 22:25:57 UTC (rev 194349)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-21 22:27:59 UTC (rev 194350)
</span><span class="lines">@@ -502,8 +502,41 @@
</span><span class="cx"> return std::make_pair(rawType, rawSelector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RetainPtr<CFDictionaryRef> removedFeature(CFDictionaryRef feature)
</del><ins>+static inline CFNumberRef defaultSelectorForTrueTypeFeature(int key, CTFontRef font)
</ins><span class="cx"> {
</span><ins>+ RetainPtr<CFArrayRef> features = adoptCF(CTFontCopyFeatures(font));
+ CFIndex featureCount = CFArrayGetCount(features.get());
+ for (CFIndex i = 0; i < featureCount; ++i) {
+ CFDictionaryRef featureType = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(features.get(), i));
+ CFNumberRef featureKey = static_cast<CFNumberRef>(CFDictionaryGetValue(featureType, kCTFontFeatureTypeIdentifierKey));
+ if (!featureKey)
+ continue;
+ int rawFeatureKey;
+ CFNumberGetValue(featureKey, kCFNumberIntType, &rawFeatureKey);
+ if (rawFeatureKey != key)
+ continue;
+
+ CFArrayRef featureSelectors = static_cast<CFArrayRef>(CFDictionaryGetValue(featureType, kCTFontFeatureTypeSelectorsKey));
+ if (!featureSelectors)
+ continue;
+ CFIndex selectorsCount = CFArrayGetCount(featureSelectors);
+ for (CFIndex j = 0; j < selectorsCount; ++j) {
+ CFDictionaryRef featureSelector = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(featureSelectors, j));
+ CFNumberRef isDefault = static_cast<CFNumberRef>(CFDictionaryGetValue(featureSelector, kCTFontFeatureSelectorDefaultKey));
+ if (!isDefault)
+ continue;
+ int rawIsDefault;
+ CFNumberGetValue(isDefault, kCFNumberIntType, &rawIsDefault);
+ if (!rawIsDefault)
+ continue;
+ return static_cast<CFNumberRef>(CFDictionaryGetValue(featureSelector, kCTFontFeatureSelectorIdentifierKey));
+ }
+ }
+ return nullptr;
+}
+
+static inline RetainPtr<CFDictionaryRef> 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 && !isTrueType)
</span><span class="lines">@@ -527,15 +560,17 @@
</span><span class="cx"> if (isTrueType) {
</span><span class="cx"> auto trueTypeFeaturePair = trueTypeFeature(feature);
</span><span class="cx"> if (trueTypeFeaturePair.first == kLowerCaseType && (trueTypeFeaturePair.second == kLowerCaseSmallCapsSelector || trueTypeFeaturePair.second == kLowerCasePetiteCapsSelector)) {
</span><del>- int rawSelector = kDefaultLowerCaseSelector;
- RetainPtr<CFNumberRef> selector = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &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 && (trueTypeFeaturePair.second == kUpperCaseSmallCapsSelector || trueTypeFeaturePair.second == kUpperCasePetiteCapsSelector)) {
</span><del>- int rawSelector = kDefaultUpperCaseSelector;
- RetainPtr<CFNumberRef> selector = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &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">@@ -553,7 +588,7 @@
</span><span class="cx"> RetainPtr<CFMutableArrayRef> newFeatures = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, featureCount, &kCFTypeArrayCallBacks));
</span><span class="cx"> for (CFIndex i = 0; i < featureCount; ++i) {
</span><span class="cx"> CFDictionaryRef feature = static_cast<CFDictionaryRef>(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>