<!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>[195849] branches/safari-601-branch/LayoutTests/css3</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/195849">195849</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-29 15:18:49 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Complete the merge of the patch in rdar://problem/24190682.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingsfontfacerenderingexpectedhtml">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingsfontfacerenderinghtml">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingsrenderingexpectedhtml">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantallexpectedhtml">branches/safari-601-branch/LayoutTests/css3/font-variant-all-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantallhtml">branches/safari-601-branch/LayoutTests/css3/font-variant-all.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantfontfaceallexpectedhtml">branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantfontfaceallhtml">branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantfontfaceoverrideexpectedhtml">branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantfontfaceoverridehtml">branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantfontfaceallexpectedhtml">branches/safari-601-branch/LayoutTests/css3/font-variant-font-faceall-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantparsingexpectedtxt">branches/safari-601-branch/LayoutTests/css3/font-variant-parsing-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontvariantparsinghtml">branches/safari-601-branch/LayoutTests/css3/font-variant-parsing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingsfontfacerenderingexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+</style>
+</head>
+<body>
+This tests that font features are able to be turned on and off as desired. It uses a special font
+designed specifically for this purpose. The test passes if you see a sequence of alternating check
+marks and X below.
+<div><span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestOTF;">BBAA</span>
+</div>
+<div><span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+<span style="font-family: FontFeaturesTestTTF;">BBAA</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingsfontfacerenderinghtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-font-face-rendering.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+</style>
+</head>
+<body>
+This tests that font features are able to be turned on and off as desired. It uses a special font
+designed specifically for this purpose. The test passes if you see a sequence of alternating check
+marks and X below.
+<div id="insertionPoint"></div>
+<div id="insertionPoint2"></div>
+<script>
+var insertionPoint = document.getElementById("insertionPoint");
+var insertionPoint2 = document.getElementById("insertionPoint2");
+
+var styleNode = document.createElement("style");
+document.head.appendChild(styleNode);
+
+function addElement(placeToInsert, familyName, extension, format, feature, c) {
+ ["0", "1"].map(function(state) {
+ styleNode.sheet.insertRule("@font-face { font-family: " + familyName + "_" + feature + "_" + state + "; src: url('resources/FontWithFeatures." + extension + "') format('" + format + "'); font-feature-settings: '" + feature + "'" + state + "; }", 0);
+ var element = document.createElement("span");
+ element.textContent = c + c;
+ element.style.fontFamily = familyName + "_" + feature + "_" + state;
+ placeToInsert.appendChild(element);
+ });
+ placeToInsert.appendChild(document.createTextNode(" "));
+}
+
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "liga", "C");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "clig", "D");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "dlig", "E");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "hlig", "F");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "calt", "G");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "subs", "H");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "sups", "I");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "smcp", "J");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "c2sc", "K");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "pcap", "L");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "c2pc", "M");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "unic", "N");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "titl", "O");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "lnum", "P");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "onum", "Q");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "pnum", "R");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "tnum", "S");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "frac", "T");
+//addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "afrc", "U");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "ordn", "V");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "zero", "W");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "hist", "X");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "jp78", "Y");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "jp83", "Z");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "jp90", "a");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "jp04", "b");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "smpl", "c");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "trad", "d");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "fwid", "e");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "pwid", "f");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "ruby", "g");
+
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "liga", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "liga", "D");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "clig", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "clig", "D");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "dlig", "G");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "hlig", "I");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "calt", "L");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "subs", "O");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "sups", "P");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "smcp", "S");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "c2sc", "V");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "pcap", "T");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "c2pc", "W");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "unic", "Y");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "titl", "a");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "lnum", "c");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "onum", "d");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "pnum", "f");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "tnum", "g");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "frac", "i");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "afrc", "j");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "ordn", "Q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "zero", "k");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "hist", "K");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "jp78", "m");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "jp83", "n");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "jp90", "o");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "jp04", "p");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "smpl", "q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "trad", "r");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "fwid", "t");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "pwid", "u");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "ruby", "v");
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingsrenderingexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-expected.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-expected.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,152 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+</style>
+</head>
+<body>
+This tests that font features are able to be turned on and off as desired. It uses a special font
+designed specifically for this purpose. The test passes if you see a sequence of alternating check
+marks and X below.
+<div style="font-family: FontWithFeaturesOTF;">AB</div>
+<div style="font-family: FontWithFeaturesTTF;">AB</div>
+<div><span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+<span style="font-family: FontFeaturesTestOTF;">BA</span>
+</div>
+<div><span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+<span style="font-family: FontFeaturesTestTTF;">BA</span>
+</div>
+<div><span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+<span style="font-family: FontWithFeaturesOTF;">BA</span>
+</div>
+<div><span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+<span style="font-family: FontWithFeaturesTTF;">BA</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantallexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-all-expected.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-all-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-all-expected.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,160 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+.fontWithFeaturesTTF {
+ font-family: "FontWithFeaturesTTF";
+}
+</style>
+</head>
+<body>
+<p>This test is a dump-render-tree test which makes sure that the following properties are appropriately applied:</p>
+<ul>
+<li>-webkit-font-variant-ligatures</li>
+<li>-webkit-font-variant-position</li>
+<li>-webkit-font-variant-caps</li>
+<li>-webkit-font-variant-numeric</li>
+<li>-webkit-font-variant-alternates</li>
+<li>-webkit-font-variant-east-asian</li>
+</ul>
+The test passes if there is a particular sequence of checks and x characters below. Note that some x characters are expected.
+<div id="insertionpoint" style="font-size: 20px;"><span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">B</span>
+<span style="font-family: FontFeaturesTestOTF;">B</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">B</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">B</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">B</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+<span style="font-family: FontFeaturesTestOTF;">A</span>
+</div>
+<div id="insertionPoint2" style="font-size: 20px;"><span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">B</span>
+<span style="font-family: FontFeaturesTestTTF;">B</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">B</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">B</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">B</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+<span style="font-family: FontFeaturesTestTTF;">A</span>
+</div>
+<div id="insertionpoint3" style="font-size: 20px;"><span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">B</span>
+<span style="font-family: FontWithFeaturesOTF;">B</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">B</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">B</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">B</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+<span style="font-family: FontWithFeaturesOTF;">A</span>
+</div>
+<div id="insertionPoint4" style="font-size: 20px;"><span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">B</span>
+<span style="font-family: FontWithFeaturesTTF;">B</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">B</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">B</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">B</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+<span style="font-family: FontWithFeaturesTTF;">A</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantallhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-all.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-all.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-all.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,176 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+</style>
+</head>
+<body>
+<p>This test is a dump-render-tree test which makes sure that the following properties are appropriately applied:</p>
+<ul>
+<li>-webkit-font-variant-ligatures</li>
+<li>-webkit-font-variant-position</li>
+<li>-webkit-font-variant-caps</li>
+<li>-webkit-font-variant-numeric</li>
+<li>-webkit-font-variant-alternates</li>
+<li>-webkit-font-variant-east-asian</li>
+</ul>
+The test passes if there is a particular sequence of checks and x characters below. Note that some x characters are expected.
+<div id="insertionPoint" style="font-size: 20px;"></div>
+<div id="insertionPoint2" style="font-size: 20px;"></div>
+<div id="insertionPoint3" style="font-size: 20px;"></div>
+<div id="insertionPoint4" style="font-size: 20px;"></div>
+<script>
+var insertionPoint = document.getElementById("insertionPoint");
+var insertionPoint2 = document.getElementById("insertionPoint2");
+var insertionPoint3 = document.getElementById("insertionPoint3");
+var insertionPoint4 = document.getElementById("insertionPoint4");
+function addElement(pointToInsert, fontFamily, property, value, text) {
+ var element = document.createElement("span");
+ element.textContent = text;
+ element.setAttribute("style", "font-family: " + fontFamily + "; " + property + ": " + value + ";");
+ pointToInsert.appendChild(element);
+ pointToInsert.appendChild(document.createTextNode(" "));
+}
+
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "common-ligatures", "C");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "common-ligatures", "D");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "no-common-ligatures", "C");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "no-common-ligatures", "D");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "discretionary-ligatures", "E");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "no-discretionary-ligatures", "E");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "historical-ligatures", "F");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "no-historical-ligatures", "F");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "contextual", "G");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-ligatures", "no-contextual", "G");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-position", "sub", "H");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-position", "super", "I");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-caps", "unicase", "N");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-caps", "titling-caps", "O");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "lining-nums", "P");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "oldstyle-nums", "Q");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "proportional-nums", "R");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "tabular-nums", "S");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "diagonal-fractions", "T");
+//addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "stacked-fractions", "U");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "ordinal", "V");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-numeric", "slashed-zero", "W");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-alternates", "historical-forms", "X");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "jis78", "Y");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "jis83", "Z");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "jis90", "a");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "jis04", "b");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "simplified", "c");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "traditional", "d");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "full-width", "e");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "proportional-width", "f");
+addElement(insertionPoint, "FontFeaturesTestOTF", "font-variant-east-asian", "ruby", "g");
+
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "common-ligatures", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "common-ligatures", "D");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "no-common-ligatures", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "no-common-ligatures", "D");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "discretionary-ligatures", "G");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "no-discretionary-ligatures", "G");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "historical-ligatures", "I");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "no-historical-ligatures", "I");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "contextual", "L");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-ligatures", "no-contextual", "L");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-position", "sub", "O");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-position", "super", "P");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-caps", "unicase", "Y");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-caps", "titling-caps", "a");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "lining-nums", "c");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "oldstyle-nums", "d");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "proportional-nums", "f");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "tabular-nums", "g");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "diagonal-fractions", "i");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "stacked-fractions", "j");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "ordinal", "Q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-numeric", "slashed-zero", "k");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-alternates", "historical-forms", "K");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "jis78", "m");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "jis83", "n");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "jis90", "o");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "jis04", "p");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "simplified", "q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "traditional", "r");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "full-width", "t");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "proportional-width", "u");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "font-variant-east-asian", "ruby", "v");
+
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "common-ligatures", "C");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "common-ligatures", "D");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "no-common-ligatures", "C");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "no-common-ligatures", "D");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "discretionary-ligatures", "E");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "no-discretionary-ligatures", "E");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "historical-ligatures", "F");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "no-historical-ligatures", "F");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "contextual", "G");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-ligatures", "no-contextual", "G");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-position", "sub", "H");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-position", "super", "I");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-caps", "unicase", "N");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-caps", "titling-caps", "O");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "lining-nums", "P");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "oldstyle-nums", "Q");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "proportional-nums", "R");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "tabular-nums", "S");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "diagonal-fractions", "T");
+//addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "stacked-fractions", "U");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "ordinal", "V");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-numeric", "slashed-zero", "W");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-alternates", "historical-forms", "X");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "jis78", "Y");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "jis83", "Z");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "jis90", "a");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "jis04", "b");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "simplified", "c");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "traditional", "d");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "full-width", "e");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "proportional-width", "f");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "font-variant-east-asian", "ruby", "g");
+
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "common-ligatures", "C");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "common-ligatures", "D");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "no-common-ligatures", "C");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "no-common-ligatures", "D");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "discretionary-ligatures", "G");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "no-discretionary-ligatures", "G");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "historical-ligatures", "I");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "no-historical-ligatures", "I");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "contextual", "L");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-ligatures", "no-contextual", "L");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-position", "sub", "O");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-position", "super", "P");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-caps", "unicase", "Y");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-caps", "titling-caps", "a");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "lining-nums", "c");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "oldstyle-nums", "d");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "proportional-nums", "f");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "tabular-nums", "g");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "diagonal-fractions", "i");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "stacked-fractions", "j");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "ordinal", "Q");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-numeric", "slashed-zero", "k");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-alternates", "historical-forms", "K");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "jis78", "m");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "jis83", "n");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "jis90", "o");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "jis04", "p");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "simplified", "q");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "traditional", "r");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "full-width", "t");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "proportional-width", "u");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "font-variant-east-asian", "ruby", "v");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantfontfaceallexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all-expected.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all-expected.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,99 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+.fontWithFeaturesTTF {
+ font-family: "FontWithFeaturesTTF";
+}
+</style>
+</head>
+<body>
+<p>This test is a dump-render-tree test which makes sure that the following properties are appropriately applied:</p>
+<ul>
+<li>-webkit-font-variant-ligatures</li>
+<li>-webkit-font-variant-position</li>
+<li>-webkit-font-variant-caps</li>
+<li>-webkit-font-variant-numeric</li>
+<li>-webkit-font-variant-alternates</li>
+<li>-webkit-font-variant-east-asian</li>
+</ul>
+The test passes if there is a particular sequence of checks and x characters below. Note that some x characters are expected.
+<div id="insertionpoint"><span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+</div>
+<div id="insertionPoint2"><span style="font-family: FontFeaturesTestTTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantfontfaceallhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-all.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<p>This test is a dump-render-tree test which makes sure that the following properties are appropriately applied:</p>
+<ul>
+<li>-webkit-font-variant-ligatures</li>
+<li>-webkit-font-variant-position</li>
+<li>-webkit-font-variant-caps</li>
+<li>-webkit-font-variant-numeric</li>
+<li>-webkit-font-variant-alternates</li>
+<li>-webkit-font-variant-east-asian</li>
+</ul>
+The test passes if there is a particular sequence of checks and x characters below. Note that some x characters are expected.
+<div id="insertionPoint"></div>
+<div id="insertionPoint2"></div>
+<script>
+var insertionPoint = document.getElementById("insertionPoint");
+var insertionPoint2 = document.getElementById("insertionPoint2");
+
+var styleNode = document.createElement("style");
+document.head.appendChild(styleNode);
+
+function addElement(pointToInsert, fontFamily, extension, format, property, value, text) {
+ styleNode.sheet.insertRule("@font-face { font-family: " + fontFamily + "_" + property + "_" + value + "; src: url('resources/FontWithFeatures." + extension + "') format('" + format + "'); " + property + ": " + value + "; }", 0);
+ var element = document.createElement("span");
+ element.textContent = text + text;
+ element.style.fontFamily = fontFamily + "_" + property + "_" + value;
+ pointToInsert.appendChild(element);
+ pointToInsert.appendChild(document.createTextNode(" "));
+}
+
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "common-ligatures", "C");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "no-common-ligatures", "C");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "discretionary-ligatures", "E");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "no-discretionary-ligatures", "E");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "historical-ligatures", "F");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "no-historical-ligatures", "F");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "contextual", "G");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-ligatures", "no-contextual", "G");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-position", "sub", "H");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-position", "super", "I");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-caps", "small-caps", "J");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-caps", "all-small-caps", "J");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-caps", "petite-caps", "L");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-caps", "all-petite-caps", "L");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-caps", "unicase", "N");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-caps", "titling-caps", "O");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "lining-nums", "P");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "oldstyle-nums", "Q");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "proportional-nums", "R");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "tabular-nums", "S");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "diagonal-fractions", "T");
+//addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "stacked-fractions", "U");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "ordinal", "V");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-numeric", "slashed-zero", "W");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-alternates", "historical-forms", "X");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "jis78", "Y");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "jis83", "Z");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "jis90", "a");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "jis04", "b");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "simplified", "c");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "traditional", "d");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "full-width", "e");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "proportional-width", "f");
+addElement(insertionPoint, "FontFeaturesTestOTF", "otf", "opentype", "font-variant-east-asian", "ruby", "g");
+
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "common-ligatures", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "no-common-ligatures", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "discretionary-ligatures", "G");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "no-discretionary-ligatures", "G");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "historical-ligatures", "I");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "no-historical-ligatures", "I");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "contextual", "L");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-ligatures", "no-contextual", "L");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-position", "sub", "O");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-position", "super", "P");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-caps", "small-caps", "S");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-caps", "all-small-caps", "S");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-caps", "petite-caps", "T");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-caps", "all-petite-caps", "T");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-caps", "unicase", "Y");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-caps", "titling-caps", "a");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "lining-nums", "c");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "oldstyle-nums", "d");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "proportional-nums", "f");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "tabular-nums", "g");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "diagonal-fractions", "i");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "stacked-fractions", "j");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "ordinal", "Q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-numeric", "slashed-zero", "k");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-alternates", "historical-forms", "K");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "jis78", "m");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "jis83", "n");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "jis90", "o");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "jis04", "p");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "simplified", "q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "traditional", "r");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "full-width", "t");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "proportional-width", "u");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ttf", "truetype", "font-variant-east-asian", "ruby", "v");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantfontfaceoverrideexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override-expected.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override-expected.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+</style>
+</head>
+<body>
+This test makes sure that local font feature styles can override the font feature styles declared in @font-face blocks.
+<div style="font: 40px FontFeaturesTestOTF;">AA</div>
+<div style="font: 40px FontFeaturesTestOTF;">BB</div>
+<div style="font: 40px FontFeaturesTestOTF;">AA</div>
+<div style="font: 40px FontFeaturesTestOTF;">BB</div>
+<div style="font: 40px FontFeaturesTestTTF;">AA</div>
+<div style="font: 40px FontFeaturesTestTTF;">BB</div>
+<div style="font: 40px FontFeaturesTestTTF;">AA</div>
+<div style="font: 40px FontFeaturesTestTTF;">BB</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantfontfaceoverridehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-font-face-override.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+ font-feature-settings: "titl" 1;
+}
+@font-face {
+ font-family: "FontFeaturesTestOTF2";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+ font-variant-caps: titling-caps;
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+ font-feature-settings: "titl" 1;
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF2";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+ font-variant-caps: titling-caps;
+}
+</style>
+</head>
+<body>
+This test makes sure that local font feature styles can override the font feature styles declared in @font-face blocks.
+<div style="font: 40px FontFeaturesTestOTF;">OO</div>
+<div style="font: 40px FontFeaturesTestOTF; font-feature-settings: 'titl' 0;">OO</div>
+<div style="font: 40px FontFeaturesTestOTF2;">OO</div>
+<div style="font: 40px FontFeaturesTestOTF2; font-feature-settings: 'titl' 0;">OO</div>
+<div style="font: 40px FontFeaturesTestTTF;">aa</div>
+<div style="font: 40px FontFeaturesTestTTF; font-feature-settings: 'titl' 0;">aa</div>
+<div style="font: 40px FontFeaturesTestTTF2;">aa</div>
+<div style="font: 40px FontFeaturesTestTTF2; font-feature-settings: 'titl' 0;">aa</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantfontfaceallexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-font-faceall-expected.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-font-faceall-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-font-faceall-expected.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,99 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+.fontWithFeaturesTTF {
+ font-family: "FontWithFeaturesTTF";
+}
+</style>
+</head>
+<body>
+<p>This test is a dump-render-tree test which makes sure that the following properties are appropriately applied:</p>
+<ul>
+<li>-webkit-font-variant-ligatures</li>
+<li>-webkit-font-variant-position</li>
+<li>-webkit-font-variant-caps</li>
+<li>-webkit-font-variant-numeric</li>
+<li>-webkit-font-variant-alternates</li>
+<li>-webkit-font-variant-east-asian</li>
+</ul>
+The test passes if there is a particular sequence of checks and x characters below. Note that some x characters are expected.
+<div id="insertionpoint"><span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+</div>
+<div id="insertionPoint2"><span style="font-family: FontFeaturesTestTTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">BB</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+<span style="font-family: FontFeaturesTestOTF;">AA</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantparsingexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-parsing-expected.txt (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-parsing-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-parsing-expected.txt 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "common-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "common-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "no-common-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "discretionary-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "no-discretionary-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "historical-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "no-historical-ligatures"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "contextual"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "no-contextual"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "common-ligatures no-contextual"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "common-ligatures no-contextual"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "none"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "none"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-position').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-position').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-position').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-position').cssText is "sub"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-position').cssText is "super"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-position').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "small-caps"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "all-small-caps"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "petite-caps"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "all-petite-caps"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "unicase"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "titling-caps"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-caps').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "oldstyle-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "proportional-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "tabular-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "diagonal-fractions"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "stacked-fractions"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "ordinal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "slashed-zero"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums slashed-zero"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "oldstyle-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "tabular-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "stacked-fractions"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums proportional-nums"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums diagonal-fractions"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "ordinal slashed-zero"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-alternates').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-alternates').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-alternates').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-alternates').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-alternates').cssText is "historical-forms"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-alternates').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis78"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis83"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis90"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis04"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "simplified"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "traditional"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "full-width"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "proportional-width"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "ruby"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis83"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "traditional"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "traditional full-width"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis04 proportional-width"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis04 proportional-width ruby"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "jis83 ruby"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-east-asian').cssText is "proportional-width"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontvariantparsinghtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/css3/font-variant-parsing.html (0 => 195849)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-variant-parsing.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-variant-parsing.html 2016-01-29 23:18:49 UTC (rev 195849)
</span><span class="lines">@@ -0,0 +1,109 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+function runTest(property, propertyText, expectedText) {
+ var element = document.createElement("span");
+ element.setAttribute("id", "testElement");
+ if (property != "")
+ element.setAttribute("style", property + ": " + propertyText + ";");
+ document.body.appendChild(element);
+ shouldBeEqualToString("window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('" + property + "').cssText", expectedText);
+ document.body.removeChild(element);
+}
+
+runTest("font-variant-ligatures", "", "normal");
+runTest("font-variant-ligatures", "normal", "normal");
+runTest("font-variant-ligatures", "normal common-ligatures", "normal");
+runTest("font-variant-ligatures", "notavalidvalue", "normal");
+runTest("font-variant-ligatures", "common-ligatures", "common-ligatures");
+runTest("font-variant-ligatures", "common-ligatures common-ligatures", "common-ligatures");
+runTest("font-variant-ligatures", "no-common-ligatures", "no-common-ligatures");
+runTest("font-variant-ligatures", "discretionary-ligatures", "discretionary-ligatures");
+runTest("font-variant-ligatures", "no-discretionary-ligatures", "no-discretionary-ligatures");
+runTest("font-variant-ligatures", "historical-ligatures", "historical-ligatures");
+runTest("font-variant-ligatures", "no-historical-ligatures", "no-historical-ligatures");
+runTest("font-variant-ligatures", "contextual", "contextual");
+runTest("font-variant-ligatures", "no-contextual", "no-contextual");
+runTest("font-variant-ligatures", "common-ligatures no-contextual", "common-ligatures no-contextual");
+runTest("font-variant-ligatures", "no-contextual common-ligatures", "common-ligatures no-contextual");
+runTest("font-variant-ligatures", "no-contextual common-ligatures notavalidvalue", "normal");
+runTest("font-variant-ligatures", "none", "none");
+runTest("font-variant-ligatures", "no-common-ligatures no-discretionary-ligatures no-historical-ligatures no-contextual", "none");
+
+runTest("font-variant-position", "", "normal");
+runTest("font-variant-position", "normal", "normal");
+runTest("font-variant-position", "notavalidvalue", "normal");
+runTest("font-variant-position", "sub", "sub");
+runTest("font-variant-position", "super", "super");
+runTest("font-variant-position", "sub super", "normal");
+
+runTest("font-variant-caps", "", "normal");
+runTest("font-variant-caps", "normal", "normal");
+runTest("font-variant-caps", "notavalidvalue", "normal");
+runTest("font-variant-caps", "normal notavalidvalue", "normal");
+runTest("font-variant-caps", "normal small-caps", "normal");
+runTest("font-variant-caps", "small-caps", "small-caps");
+runTest("font-variant-caps", "all-small-caps", "all-small-caps");
+runTest("font-variant-caps", "petite-caps", "petite-caps");
+runTest("font-variant-caps", "all-petite-caps", "all-petite-caps");
+runTest("font-variant-caps", "unicase", "unicase");
+runTest("font-variant-caps", "titling-caps", "titling-caps");
+runTest("font-variant-caps", "unicase titling-caps", "normal");
+runTest("font-variant-caps", "small-caps all-small-caps", "normal");
+
+runTest("font-variant-numeric", "", "normal");
+runTest("font-variant-numeric", "normal", "normal");
+runTest("font-variant-numeric", "notavalidvalue", "normal");
+runTest("font-variant-numeric", "normal notavalidvalue", "normal");
+runTest("font-variant-numeric", "normal lining-nums", "normal");
+runTest("font-variant-numeric", "lining-nums", "lining-nums");
+runTest("font-variant-numeric", "oldstyle-nums", "oldstyle-nums");
+runTest("font-variant-numeric", "proportional-nums", "proportional-nums");
+runTest("font-variant-numeric", "tabular-nums", "tabular-nums");
+runTest("font-variant-numeric", "diagonal-fractions", "diagonal-fractions");
+runTest("font-variant-numeric", "stacked-fractions", "stacked-fractions");
+runTest("font-variant-numeric", "ordinal", "ordinal");
+runTest("font-variant-numeric", "slashed-zero", "slashed-zero");
+runTest("font-variant-numeric", "lining-nums slashed-zero", "lining-nums slashed-zero");
+runTest("font-variant-numeric", "lining-nums oldstyle-nums", "oldstyle-nums");
+runTest("font-variant-numeric", "proportional-nums tabular-nums", "tabular-nums");
+runTest("font-variant-numeric", "diagonal-fractions stacked-fractions", "stacked-fractions");
+runTest("font-variant-numeric", "lining-nums proportional-nums", "lining-nums proportional-nums");
+runTest("font-variant-numeric", "lining-nums diagonal-fractions", "lining-nums diagonal-fractions");
+runTest("font-variant-numeric", "ordinal slashed-zero", "ordinal slashed-zero");
+
+runTest("font-variant-alternates", "", "normal");
+runTest("font-variant-alternates", "normal", "normal");
+runTest("font-variant-alternates", "notavalidvalue", "normal");
+runTest("font-variant-alternates", "normal notavalidvalue", "normal");
+runTest("font-variant-alternates", "historical-forms", "historical-forms");
+runTest("font-variant-alternates", "normal historical-forms", "normal");
+
+runTest("font-variant-east-asian", "", "normal");
+runTest("font-variant-east-asian", "normal", "normal");
+runTest("font-variant-east-asian", "notavalidvalue", "normal");
+runTest("font-variant-east-asian", "normal notavalidvalue", "normal");
+runTest("font-variant-east-asian", "jis78", "jis78");
+runTest("font-variant-east-asian", "jis83", "jis83");
+runTest("font-variant-east-asian", "jis90", "jis90");
+runTest("font-variant-east-asian", "jis04", "jis04");
+runTest("font-variant-east-asian", "simplified", "simplified");
+runTest("font-variant-east-asian", "traditional", "traditional");
+runTest("font-variant-east-asian", "full-width", "full-width");
+runTest("font-variant-east-asian", "proportional-width", "proportional-width");
+runTest("font-variant-east-asian", "ruby", "ruby");
+runTest("font-variant-east-asian", "jis78 jis83", "jis83");
+runTest("font-variant-east-asian", "jis90 traditional", "traditional");
+runTest("font-variant-east-asian", "full-width traditional", "traditional full-width");
+runTest("font-variant-east-asian", "jis04 proportional-width", "jis04 proportional-width");
+runTest("font-variant-east-asian", "jis04 proportional-width ruby", "jis04 proportional-width ruby");
+runTest("font-variant-east-asian", "jis83 ruby", "jis83 ruby");
+runTest("font-variant-east-asian", "full-width proportional-width", "proportional-width");
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>