<!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>[193589] branches/safari-601.1.46-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193589">193589</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-12-06 13:53:53 -0800 (Sun, 06 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190848">r190848</a>. rdar://problem/23769702</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontfeaturesettingsrenderinghtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3resourcesFontWithFeaturesttf">branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformeflTestExpectations">branches/safari-601.1.46-branch/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformmacTestExpectations">branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformwinTestExpectations">branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#branchessafari601146branchToolsChangeLog">branches/safari-601.1.46-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj">branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreemacConfigurationsDumpRenderTreeAppxcconfig">branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreemacDumpRenderTreemm">branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#branchessafari601146branchToolsFontWithFeaturesFontWithFeaturesFontCreatorcpp">branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp</a></li>
<li><a href="#branchessafari601146branchToolsFontWithFeaturesFontWithFeaturesmaincpp">branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerInjectedBundlecocoaActivateFontsCocoamm">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnermacTestControllerMacmm">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchToolsDumpRenderTreefontsFontWithFeaturesotf">branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreefontsFontWithFeaturesttf">branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.ttf</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerFontWithFeaturesotf">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.otf</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerFontWithFeaturesttf">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.ttf</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestscss3fontfeaturesettingspreinstalledfontshtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontfeaturesettingsrendering2expectedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3fontfeaturesettingsrendering2html">branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformeflcss3fontfeaturesettingsrenderingexpectedpng">branches/safari-601.1.46-branch/LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.png</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformeflcss3fontfeaturesettingsrenderingexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformgtkcss3fontfeaturesettingsrenderingexpectedpng">branches/safari-601.1.46-branch/LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.png</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformgtkcss3fontfeaturesettingsrenderingexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformiossimulatorcss3fontfeaturesettingsrenderingexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator/css3/font-feature-settings-rendering-expected.txt</a></li>
<li>branches/safari-601.1.46-branch/LayoutTests/platform/mac-yosemite/css3/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190848. rdar://problem/23769702
+
+ 2015-10-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Test font-variant-* and font-feature-settings with mocked preinstalled fonts
+ https://bugs.webkit.org/show_bug.cgi?id=149777
+
+ Reviewed by Simon Fraser.
+
+ See per-file comments.
+
+ * css3/font-feature-settings-preinstalled-fonts.html: Removed. Superseded by
+ css3/font-feature-settings-rendering.html.
+ * css3/font-feature-settings-rendering-2-expected.html: Removed.
+ * css3/font-feature-settings-rendering-2.html: Removed. Renamed to
+ css3/font-feature-settings-rendering.html
+ * css3/font-feature-settings-rendering-expected.html: Added.
+ * css3/font-feature-settings-rendering.html:
+ * css3/font-variant-all-expected.html:
+ * css3/font-variant-all.html:
+ * css3/resources/FontWithFeatures.otf: Update for new 'name' table.
+ * css3/resources/FontWithFeatures.ttf: Ditto.
+
+2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190697. rdar://problem/23769727
</span><span class="cx">
</span><span class="cx"> 2015-10-07 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontfeaturesettingspreinstalledfontshtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-<p>
-This test dumps render tree information for text styled with font-feature-settings.
-</p>
-<script>
-var fonts = ["Andale Mono", "Arial", "Didot", "Geneva", "Georgia", "Gill Sans", "Helvetica", "Helvetica Neue", "Hoefler Text", "Impact", "Lucida Grande", "Menlo", "Monaco", "Optima", "Tahoma", "Times", "Verdana", "Zapfino"];
-var features = ['"smcp" 1', '"c2sc" 1', '"zero" 1', '"nalt" 1', '"kern" 1', '"liga" 1', '"dlig" 1', '"hlig" 1', '"clig" 1', '"swsh" 1', '"calt" 1', '"hist" 1', '"salt" 1', '"ss01" 1', '"ss02" 1', '"ss03" 1', '"ss04" 1', '"ss05" 1', '"lnum" 1', '"onum" 1', '"pnum" 1', '"tnum" 1', '"frac" 1', '"afrc" 1'];
-fonts.map(function(font) {
- features.map(function(feature) {
- var element = document.createElement("div");
- element.textContent = "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in fjord.";
- element.style.fontFamily = font;
- element.style.fontFeatureSettings = feature;
- document.body.appendChild(element);
- });
-});
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontfeaturesettingsrendering2expectedhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
- font-family: "FontFeaturesTest";
- 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: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">BA</span>
-<span style="font-family: FontFeaturesTest;">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>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontfeaturesettingsrendering2html"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
- font-family: "FontFeaturesTest";
- 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");
-function addElement(placeToInsert, familyName, feature, c) {
- ["0", "1"].map(function(state) {
- var element = document.createElement("span");
- element.textContent = c;
- element.style.fontFamily = familyName;
- element.style.fontFeatureSettings = '"' + feature + '" ' + state;
- placeToInsert.appendChild(element);
- });
- placeToInsert.appendChild(document.createTextNode(" "));
-}
-
-addElement(insertionPoint, "FontFeaturesTest", "liga", "C");
-addElement(insertionPoint, "FontFeaturesTest", "clig", "D");
-addElement(insertionPoint, "FontFeaturesTest", "dlig", "E");
-addElement(insertionPoint, "FontFeaturesTest", "hlig", "F");
-addElement(insertionPoint, "FontFeaturesTest", "calt", "G");
-addElement(insertionPoint, "FontFeaturesTest", "subs", "H");
-addElement(insertionPoint, "FontFeaturesTest", "sups", "I");
-addElement(insertionPoint, "FontFeaturesTest", "smcp", "J");
-addElement(insertionPoint, "FontFeaturesTest", "c2sc", "K");
-addElement(insertionPoint, "FontFeaturesTest", "pcap", "L");
-addElement(insertionPoint, "FontFeaturesTest", "c2pc", "M");
-addElement(insertionPoint, "FontFeaturesTest", "unic", "N");
-addElement(insertionPoint, "FontFeaturesTest", "titl", "O");
-addElement(insertionPoint, "FontFeaturesTest", "lnum", "P");
-addElement(insertionPoint, "FontFeaturesTest", "onum", "Q");
-addElement(insertionPoint, "FontFeaturesTest", "pnum", "R");
-addElement(insertionPoint, "FontFeaturesTest", "tnum", "S");
-addElement(insertionPoint, "FontFeaturesTest", "frac", "T");
-//addElement(insertionPoint, "FontFeaturesTest", "afrc", "U");
-addElement(insertionPoint, "FontFeaturesTest", "ordn", "V");
-addElement(insertionPoint, "FontFeaturesTest", "zero", "W");
-addElement(insertionPoint, "FontFeaturesTest", "hist", "X");
-addElement(insertionPoint, "FontFeaturesTest", "jp78", "Y");
-addElement(insertionPoint, "FontFeaturesTest", "jp83", "Z");
-addElement(insertionPoint, "FontFeaturesTest", "jp90", "a");
-addElement(insertionPoint, "FontFeaturesTest", "jp04", "b");
-addElement(insertionPoint, "FontFeaturesTest", "smpl", "c");
-addElement(insertionPoint, "FontFeaturesTest", "trad", "d");
-addElement(insertionPoint, "FontFeaturesTest", "fwid", "e");
-addElement(insertionPoint, "FontFeaturesTest", "pwid", "f");
-addElement(insertionPoint, "FontFeaturesTest", "ruby", "g");
-
-addElement(insertionPoint2, "FontFeaturesTestTTF", "liga", "C");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "liga", "D");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "clig", "C");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "clig", "D");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "dlig", "G");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "hlig", "I");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "calt", "L");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "subs", "O");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "sups", "P");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "smcp", "S");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "c2sc", "V");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "pcap", "T");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "c2pc", "W");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "unic", "Y");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "titl", "a");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "lnum", "c");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "onum", "d");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "pnum", "f");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "tnum", "g");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "frac", "i");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "afrc", "j");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "ordn", "Q");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "zero", "k");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "hist", "K");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "jp78", "m");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "jp83", "n");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "jp90", "o");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "jp04", "p");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "smpl", "q");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "trad", "r");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "fwid", "t");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "pwid", "u");
-addElement(insertionPoint2, "FontFeaturesTestTTF", "ruby", "v");
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3fontfeaturesettingsrenderinghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,40 +1,172 @@
</span><ins>+<!DOCTYPE html>
+<html>
</ins><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> @font-face {
</span><del>- /* FeatureTest.ttf is a small font for testing OpenType features.
- * It contains:
- * - The black box glyph which is associated with 'W', 'e', 'b', 'K', 'i' and 't'.
- * - A discretionary ligature glyph of 'WebKit'.
- */
- font-family: 'test';
- src: url(resources/FeatureTest.ttf);
</del><ins>+ font-family: "FontFeaturesTestOTF";
+ src: url("resources/FontWithFeatures.otf") format("opentype");
</ins><span class="cx"> }
</span><del>-.dligOn {
- font-family: 'test';
- font-feature-settings: 'dlig';
</del><ins>+@font-face {
+ font-family: "FontFeaturesTestTTF";
+ src: url("resources/FontWithFeatures.ttf") format("truetype");
</ins><span class="cx"> }
</span><del>-.dligOff {
- font-family: 'test';
- font-feature-settings: 'dlig' 0;
-}
-.dligNone {
- font-family: 'test';
-}
</del><span class="cx"> </style>
</span><ins>+</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>
+<div id="insertionPoint3"></div>
+<div id="insertionPoint4"></div>
</ins><span class="cx"> <script>
</span><del>-if (window.testRunner)
- window.testRunner.waitUntilDone();
</del><ins>+var insertionPoint = document.getElementById("insertionPoint");
+var insertionPoint2 = document.getElementById("insertionPoint2");
+var insertionPoint3 = document.getElementById("insertionPoint3");
+var insertionPoint4 = document.getElementById("insertionPoint4");
+function addElement(placeToInsert, familyName, feature, c) {
+ ["0", "1"].map(function(state) {
+ var element = document.createElement("span");
+ element.textContent = c;
+ element.style.fontFamily = familyName;
+ element.style.fontFeatureSettings = '"' + feature + '" ' + state;
+ placeToInsert.appendChild(element);
+ });
+ placeToInsert.appendChild(document.createTextNode(" "));
+}
</ins><span class="cx">
</span><del>-function test() {
- document.body.offsetTop;
- if (window.testRunner)
- testRunner.notifyDone();
-}
</del><ins>+addElement(insertionPoint, "FontFeaturesTestOTF", "liga", "C");
+addElement(insertionPoint, "FontFeaturesTestOTF", "clig", "D");
+addElement(insertionPoint, "FontFeaturesTestOTF", "dlig", "E");
+addElement(insertionPoint, "FontFeaturesTestOTF", "hlig", "F");
+addElement(insertionPoint, "FontFeaturesTestOTF", "calt", "G");
+addElement(insertionPoint, "FontFeaturesTestOTF", "subs", "H");
+addElement(insertionPoint, "FontFeaturesTestOTF", "sups", "I");
+addElement(insertionPoint, "FontFeaturesTestOTF", "smcp", "J");
+addElement(insertionPoint, "FontFeaturesTestOTF", "c2sc", "K");
+addElement(insertionPoint, "FontFeaturesTestOTF", "pcap", "L");
+addElement(insertionPoint, "FontFeaturesTestOTF", "c2pc", "M");
+addElement(insertionPoint, "FontFeaturesTestOTF", "unic", "N");
+addElement(insertionPoint, "FontFeaturesTestOTF", "titl", "O");
+addElement(insertionPoint, "FontFeaturesTestOTF", "lnum", "P");
+addElement(insertionPoint, "FontFeaturesTestOTF", "onum", "Q");
+addElement(insertionPoint, "FontFeaturesTestOTF", "pnum", "R");
+addElement(insertionPoint, "FontFeaturesTestOTF", "tnum", "S");
+addElement(insertionPoint, "FontFeaturesTestOTF", "frac", "T");
+//addElement(insertionPoint, "FontFeaturesTestOTF", "afrc", "U");
+addElement(insertionPoint, "FontFeaturesTestOTF", "ordn", "V");
+addElement(insertionPoint, "FontFeaturesTestOTF", "zero", "W");
+addElement(insertionPoint, "FontFeaturesTestOTF", "hist", "X");
+addElement(insertionPoint, "FontFeaturesTestOTF", "jp78", "Y");
+addElement(insertionPoint, "FontFeaturesTestOTF", "jp83", "Z");
+addElement(insertionPoint, "FontFeaturesTestOTF", "jp90", "a");
+addElement(insertionPoint, "FontFeaturesTestOTF", "jp04", "b");
+addElement(insertionPoint, "FontFeaturesTestOTF", "smpl", "c");
+addElement(insertionPoint, "FontFeaturesTestOTF", "trad", "d");
+addElement(insertionPoint, "FontFeaturesTestOTF", "fwid", "e");
+addElement(insertionPoint, "FontFeaturesTestOTF", "pwid", "f");
+addElement(insertionPoint, "FontFeaturesTestOTF", "ruby", "g");
+
+addElement(insertionPoint2, "FontFeaturesTestTTF", "liga", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "liga", "D");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "clig", "C");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "clig", "D");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "dlig", "G");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "hlig", "I");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "calt", "L");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "subs", "O");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "sups", "P");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "smcp", "S");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "c2sc", "V");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "pcap", "T");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "c2pc", "W");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "unic", "Y");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "titl", "a");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "lnum", "c");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "onum", "d");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "pnum", "f");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "tnum", "g");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "frac", "i");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "afrc", "j");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ordn", "Q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "zero", "k");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "hist", "K");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "jp78", "m");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "jp83", "n");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "jp90", "o");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "jp04", "p");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "smpl", "q");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "trad", "r");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "fwid", "t");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "pwid", "u");
+addElement(insertionPoint2, "FontFeaturesTestTTF", "ruby", "v");
+
+addElement(insertionPoint3, "FontWithFeaturesOTF", "liga", "C");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "clig", "D");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "dlig", "E");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "hlig", "F");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "calt", "G");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "subs", "H");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "sups", "I");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "smcp", "J");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "c2sc", "K");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "pcap", "L");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "c2pc", "M");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "unic", "N");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "titl", "O");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "lnum", "P");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "onum", "Q");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "pnum", "R");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "tnum", "S");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "frac", "T");
+//addElement(insertionPoint3, "FontWithFeaturesOTF", "afrc", "U");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "ordn", "V");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "zero", "W");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "hist", "X");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "jp78", "Y");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "jp83", "Z");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "jp90", "a");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "jp04", "b");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "smpl", "c");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "trad", "d");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "fwid", "e");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "pwid", "f");
+addElement(insertionPoint3, "FontWithFeaturesOTF", "ruby", "g");
+
+addElement(insertionPoint4, "FontWithFeaturesTTF", "liga", "C");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "liga", "D");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "clig", "C");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "clig", "D");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "dlig", "G");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "hlig", "I");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "calt", "L");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "subs", "O");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "sups", "P");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "smcp", "S");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "c2sc", "V");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "pcap", "T");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "c2pc", "W");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "unic", "Y");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "titl", "a");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "lnum", "c");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "onum", "d");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "pnum", "f");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "tnum", "g");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "frac", "i");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "afrc", "j");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "ordn", "Q");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "zero", "k");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "hist", "K");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "jp78", "m");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "jp83", "n");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "jp90", "o");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "jp04", "p");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "smpl", "q");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "trad", "r");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "fwid", "t");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "pwid", "u");
+addElement(insertionPoint4, "FontWithFeaturesTTF", "ruby", "v");
</ins><span class="cx"> </script>
</span><del>-</head>
-<body onload="setTimeout(test, 300)">
-<p>Test for font-feature-settings property. The first word of the following three words should be displayed like "WebKit", while others should be displayed as black boxes.</p>
-<div class="dligOn">WebKit</div>
-<div class="dligOff">WebKit</div>
-<div class="dligNone">WebKit</div>
</del><span class="cx"> </body>
</span><ins>+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3resourcesFontWithFeaturesttf"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><del>-true\x80@OS/2H\xE0Yb\xCCdcmap\xD5\xAF0jfeat\xA7Rp\x9Clglyf\xC8(\xD5\xC3headeD\xF9 6hheag7X$hmtx\xD4\x86|\xD4loca\xAB9P\xD8maxpk( morx\xC9BH@name\x9FW!\x88-\x8Epost/ \xF4TKBW\xFF\xFFf\xFF\xFC\xFF\xFF \xFF\xFFD
</del><ins>+true\x80@OS/2H\xE0Yb\xCCdcmap\xD5\xAF0jfeat\xA7Rp\x9Clglyf\xC8(\xD5\xC3headeD\xF9 6hheag7X$hmtx\xD4\x86|\xD4loca\xAB9P\xD8maxpk( morx\xC9BH@nameل/\xF4!\x88|post0 \xF4TKBW\xFF\xFFf\xFF\xFC\xFF\xFF \xFF\xFFD
</ins><span class="cx"> (AZaz&Zz\xFF\xFFAa\xFF\xFF\xFF\xDA\xFF\xA0        \xB4$\xD8
</span><span class="cx">
</span><span class="cx"> \xE0\x80-%\xF0\x80&\xFC\x80\x80\x80\x80$\x80#0\x80'<,@\x80/\\x807h;        .c+ccccc !"c$%&c()*-c0123456c89:<\xC8\xC8 \xC8X\xFD\xA8\xC8X\xFD\xA8\xC8\xC8\xB6\xBC\xC82\xFA\x902\xFE>\xFE\xD4\xF42\xFF\x90\xFF\xCE\xFE>,22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90
\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp
2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x
90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&a
mp;\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\
x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\x
FF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xC
E\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFE
p\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFE
p\xFF\xCE\x90\xFEp2\x90\x902\xFEpZ2M_<\xF5f5\xC8\xC8222222222222222222222222222222222222222222222222222'X\xA7\xF6E\x94\xE32\x81\xD0n\xBD[\xAA\xF9H\x97\xE65\x84\xD3"q\xC0^\xAD\xFC        K        \x9A        \xE9
</span><ins>+%\xF0\x80&\xFC\x80\x80\x80\x80$\x80#0\x80'<,@\x80/\\x807h;        .c+ccccc !"c$%&c()*-c0123456c89:<\xC8\xC8 \xC8X\xFD\xA8\xC8X\xFD\xA8\xC8\xC8\xB6\xBC\xC82\xFA\x902\xFE>\xFE\xD4\xF42\xFF\x90\xFF\xCE\xFE>,22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\x
CE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xF
Ep\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xF
Ep\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xF
F\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE
\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90
\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp
2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x
90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x
902\xFEp\xE5\xD7з_<\xF5f5\xC8\xC8222222222222222222222222222222222222222222222222222'X\xA7\xF6E\x94\xE32\x81\xD0n\xBD[\xAA\xF9H\x97\xE65\x84\xD3"q\xC0^\xAD\xFC        K        \x9A        \xE9
</ins><span class="cx"> 8
</span><span class="cx"> \x87
</span><span class="cx"> \xD6%t\xC3a\xB0\xFF@@ -15,10 +14,11 @@
</span><span class="cx"> c\xFF\xFF\xFF\xFFD
</span><span class="cx"> \xFF\xFF\xFF\xFFD
</span><span class="cx"> \xFF\xFF\xFF\xFFD
</span><del>-\xFF\xFF\xFF\xFFD%c\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD&c\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD
\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFF D\xFF\xFF\xFF\xFF!Dc\xFF\xFF\xFF\xFF"D\xFF\xFF\xFF\xFF#D\xFF\xFF\xFF\xFF$D\xFF\xFF\xFF\xFF%Dc\xFF\xFF\xFF\xFF&D\xFF\xFF\xFF\xFF'D\xFF\xFF\xFF\xFF(D\xFF\xFF\xFF\xFF
)D\xFF\xFF\xFF\xFF*D\xFF\xFF\xFF\xFF+D\xFF\xFF\xFF\xFF,Dc\xFF\xFF\xFF\xFF-D\xFF\xFF\xFF\xFF.D\xFF\xFF\xFF\xFF/D\xFF\xFF\xFF\xFF0=\xE2        .b\x9E\xD4Bt        \xB0.\xEE
-*\ \x9A-\xDA.R+v\x98\xB4\xDELh\x92\xC8HLn\x98\xC0 \xDE!":#l$\x90%\xBA&\xF2'&(B)l*\xA0,\xD4-/,0R1|2\xB03\xE44        5        L6        \x867        \xC28        \xE29
-:
-:;
-l<
-\x86MylesFontkLigaturesTypekCommonLigaturesOnSelectorkContextualLigaturesOnSelectorkCommonLigaturesOffSelectorkContextualLigaturesOffSelectorkRareLigaturesOnSelectorkRareLigaturesOffSelectorkHistoricalLigaturesOnSelectorkHistoricalLigaturesOffSelectorkHistoricalLigaturesOnSelectorkContextualAlternatesTypekContextualAlternatesOnSelectorkContextualAlternatesOffSelectorkVerticalPositionTypedefaultUnusedSelectorkInferiorsSelectorkSuperiorsSelectorkOrdinalsSelectorkLowerCaseTypedefaultUnusedSelec
torkLowerCaseSmallCapsSelectorkLowerCasePetiteCapsSelectorkUpperCaseTypedefaultUnusedSelectorkUpperCaseSmallCapsSelectorkUpperCasePetiteCapsSelectorkLetterCaseTypedefaultUnusedSelector14kStyleOptionsTypedefaultUnusedSelectorkTitlingCapsSelectorkNumberCaseTypedefaultUnusedSelectorkUpperCaseNumbersSelectorkLowerCaseNumbersSelectorkNumberSpacingTypedefaultUnusedSelectorkProportionalNumbersSelectorkMonospacedNumbersSelectorkFractionsTypedefaultUnusedSelectorkDiagonalFractionsSelectorkVerticalFr
actionsSelectorkTypographicExtrasTypekSlashedZeroOnSelectorkCharacterShapeTypedefaultUnusedSelectorkJIS1978CharactersSelectorkJIS1983CharactersSelectorkJIS1990CharactersSelectorkJIS2004CharactersSelectorkSimplifiedCharactersSelectorkTraditionalCharactersSelectorkTextSpacingTypedefaultUnusedSelectorkMonospacedTextSelectorkProportionalTextSelectorkRubyKanaTypekRubyKanaOnSelector
</del><span class="cx">\ No newline at end of file
</span><ins>+\xFF\xFF\xFF\xFFD%c\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD&c\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD
\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFF D\xFF\xFF\xFF\xFF!Dc\xFF\xFF\xFF\xFF"D\xFF\xFF\xFF\xFF#D\xFF\xFF\xFF\xFF$D\xFF\xFF\xFF\xFF%Dc\xFF\xFF\xFF\xFF&D\xFF\xFF\xFF\xFF'D\xFF\xFF\xFF\xFF(D\xFF\xFF\xFF\xFF
)D\xFF\xFF\xFF\xFF*D\xFF\xFF\xFF\xFF+D\xFF\xFF\xFF\xFF,Dc\xFF\xFF\xFF\xFF-D\xFF\xFF\xFF\xFF.D\xFF\xFF\xFF\xFF/D\xFF\xFF\xFF\xFF0B&&&&L&r\x98&\x9E\xC44\xE0<6P>\x860\xC42\xF4<&        >b.<\xA0
+2\xDC>@L+*\x8C*\xB6$\xE0$+"(J*f6\x908\xC6\xFE*6D8z\xB2*\xD0\xFA"\xFE* (Jr *\x90!2\xBA"2\xEC#$$*B%8l&4\xA4'\xD8(*\xF4)4*4R,,\x86-,\xB2/&\xDE0*        14        .24        b34        \x9644        \xCA5:        \xFE6<
+87
+t8*
+\x949.
+\xBE:2
+\xEC;<&8FontWithFeaturesTTFFontWithFeaturesTTFFontWithFeaturesTTFFontWithFeaturesTTF1.0FontWithFeaturesTTFkLigaturesTypekCommonLigaturesOnSelectorkContextualLigaturesOnSelectorkCommonLigaturesOffSelectorkContextualLigaturesOffSelectorkRareLigaturesOnSelectorkRareLigaturesOffSelectorkHistoricalLigaturesOnSelectorkHistoricalLigaturesOffSelectorkHistoricalLigaturesOnSelectorkContextualAlternatesTypekContextualAlternatesOnSelectorkContextualAlternatesOffSelectorkVerticalPositionTypede
faultUnusedSelectorkInferiorsSelectorkSuperiorsSelectorkOrdinalsSelectorkLowerCaseTypedefaultUnusedSelectorkLowerCaseSmallCapsSelectorkLowerCasePetiteCapsSelectorkUpperCaseTypedefaultUnusedSelectorkUpperCaseSmallCapsSelectorkUpperCasePetiteCapsSelectorkLetterCaseTypedefaultUnusedSelector14kStyleOptionsTypedefaultUnusedSelectorkTitlingCapsSelectorkNumberCaseTypedefaultUnusedSelectorkUpperCaseNumbersSelectorkLowerCaseNumbersSelectorkNumberSpacingTypedefaultUnusedSelectorkProportionalNumbersS
electorkMonospacedNumbersSelectorkFractionsTypedefaultUnusedSelectorkDiagonalFractionsSelectorkVerticalFractionsSelectorkTypographicExtrasTypekSlashedZeroOnSelectorkCharacterShapeTypedefaultUnusedSelectorkJIS1978CharactersSelectorkJIS1983CharactersSelectorkJIS1990CharactersSelectorkJIS2004CharactersSelectorkSimplifiedCharactersSelectorkTraditionalCharactersSelectorkTextSpacingTypedefaultUnusedSelectorkMonospacedTextSelectorkProportionalTextSelectorkRubyKanaTypekRubyKanaOnSelector
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/platform/efl/TestExpectations (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/efl/TestExpectations        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/efl/TestExpectations        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -83,6 +83,9 @@
</span><span class="cx">
</span><span class="cx"> css3/font-feature-settings-rendering-2.html [ Skip ]
</span><span class="cx">
</span><ins>+# Need to implement font feature seeting for EFL port since r188146.
+css3/font-feature-settings-rendering.html [ Skip ]
+
</ins><span class="cx"> # ----------------------------------------
</span><span class="cx"> # Tests which also fail in other platforms
</span><span class="cx"> # ----------------------------------------
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformeflcss3fontfeaturesettingsrenderingexpectedpng"></a>
<div class="binary"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformeflcss3fontfeaturesettingsrenderingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.txt (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.txt        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.txt        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 783x35
- text run at (0,0) width 243: "Test for font-feature-settings property. "
- text run at (243,0) width 540: "The first word of the following three words should be displayed like \"WebKit\", while"
- text run at (0,18) width 267: "others should be displayed as black boxes."
- RenderBlock {DIV} at (0,52) size 784x17
- RenderText {#text} at (0,0) size 30x16
- text run at (0,0) width 30: "WebKit"
- RenderBlock {DIV} at (0,69) size 784x17
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
- RenderBlock {DIV} at (0,86) size 784x17
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformgtkcss3fontfeaturesettingsrenderingexpectedpng"></a>
<div class="binary"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformgtkcss3fontfeaturesettingsrenderingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.txt (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.txt        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.txt        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x34
- RenderText {#text} at (0,0) size 783x34
- text run at (0,0) width 243: "Test for font-feature-settings property. "
- text run at (243,0) width 540: "The first word of the following three words should be displayed like \"WebKit\", while"
- text run at (0,17) width 267: "others should be displayed as black boxes."
- RenderBlock {DIV} at (0,50) size 784x16
- RenderText {#text} at (0,0) size 30x16
- text run at (0,0) width 30: "WebKit"
- RenderBlock {DIV} at (0,66) size 784x16
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
- RenderBlock {DIV} at (0,82) size 784x16
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformiossimulatorcss3fontfeaturesettingsrenderingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator/css3/font-feature-settings-rendering-expected.txt (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator/css3/font-feature-settings-rendering-expected.txt        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/ios-simulator/css3/font-feature-settings-rendering-expected.txt        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 756x39
- text run at (0,0) width 248: "Test for font-feature-settings property. "
- text run at (247,0) width 509: "The first word of the following three words should be displayed like \"WebKit\","
- text run at (0,20) width 312: "while others should be displayed as black boxes."
- RenderBlock {DIV} at (0,56) size 784x17
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
- RenderBlock {DIV} at (0,73) size 784x17
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
- RenderBlock {DIV} at (0,90) size 784x17
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "WebKit"
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -266,13 +266,13 @@
</span><span class="cx"> # ENABLE(DRAGGABLE_REGION) is disabled
</span><span class="cx"> fast/css/draggable-region-parser.html
</span><span class="cx">
</span><del>-# Font feature settings is not implemented.
-css3/font-feature-settings-rendering.html
</del><ins>+# Font features are not implemented on Mavericks.
+webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-rendering.html [ ImageOnlyFailure ]
+webkit.org/b/149246 [ Mavericks ] css3/font-variant-all.html [ ImageOnlyFailure ]
+webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-font-face-rendering.html [ ImageOnlyFailure ]
+webkit.org/b/149246 [ Mavericks ] css3/font-variant-font-face-all.html [ ImageOnlyFailure ]
+webkit.org/b/149246 [ Mavericks ] css3/font-variant-font-face-override.html [ ImageOnlyFailure ]
</ins><span class="cx">
</span><del>-webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-rendering-2.html
-webkit.org/b/149246 [ Mavericks ] css3/font-variant-all-webfont.html
-webkit.org/b/149246 [ Mavericks ] css3/font-variant-parsing.html
-
</del><span class="cx"> # This feature is disabled on Mavericks.
</span><span class="cx"> [ Mavericks ] http/tests/navigation/page-cache-pending-image-load.html [ Skip ]
</span><span class="cx"> [ Mavericks ] http/tests/navigation/page-cache-pending-image-load-cache-partition.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -458,7 +458,6 @@
</span><span class="cx">
</span><span class="cx"> # Font feature settings is not implemented.
</span><span class="cx"> css3/font-feature-settings-rendering.html [ Skip ]
</span><del>-css3/font-feature-settings-rendering-2.html [ Skip ]
</del><span class="cx">
</span><span class="cx"> # TODO HiDPI tests require test infrastructure enhancements (e.g. testRunner.setBackingScaleFactor)
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=87919
</span></span></pre></div>
<a id="branchessafari601146branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/ChangeLog (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/ChangeLog        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/ChangeLog        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190848. rdar://problem/23769702
+
+ "Build fix" (r193582) from Expo branch squash-merged here:
+
+ * Tools/DumpRenderTree/fonts/FontWithFeatures.otf: Added.
+ * Tools/DumpRenderTree/fonts/FontWithFeatures.ttf: Added.
+ * Tools/WebKitTestRunner/FontWithFeatures.otf: Added.
+ * Tools/WebKitTestRunner/FontWithFeatures.ttf: Added.
+
+ 2015-10-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Test font-variant-* and font-feature-settings with mocked preinstalled fonts
+ https://bugs.webkit.org/show_bug.cgi?id=149777
+
+ Reviewed by Simon Fraser.
+
+ Include FontWithFeatures in DumpRenderTree and WebKitTestRunner. Add it
+ to the list of tests to preinstall at startup time.
+
+ Also, update the generation of the 'name' table in the FontWithFeatures font.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (allowedFontFamilySet):
+ (activateTestingFonts):
+ (activateFontsIOS):
+ * FontWithFeatures/FontWithFeatures/FontCreator.cpp:
+ (Generator::generate):
+ (Generator::appendCFFTable):
+ (Generator::appendNameSubtable):
+ (Generator::appendNAMETable):
+ * FontWithFeatures/FontWithFeatures/main.cpp:
+ (main):
+ * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
+ (WTR::allowedFontFamilySet):
+ (WTR::activateFonts):
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::allowedFontFamilySet):
+
+2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190697. rdar://problem/23769727
</span><span class="cx">
</span><span class="cx"> 2015-10-07 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -127,6 +127,8 @@
</span><span class="cx">                 C06F9ABC1267A7060058E1F6 /* PassDifferentNPPStruct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06F9ABB1267A7060058E1F6 /* PassDifferentNPPStruct.cpp */; };
</span><span class="cx">                 C0E720751281C828004EF533 /* EvaluateJSAfterRemovingPluginElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E720741281C828004EF533 /* EvaluateJSAfterRemovingPluginElement.cpp */; };
</span><span class="cx">                 C0EC3C9C12787F0500939164 /* NullNPPGetValuePointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0EC3C9B12787F0500939164 /* NullNPPGetValuePointer.cpp */; };
</span><ins>+                C23EA2081BC9F05100C980B7 /* FontWithFeatures.otf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = C23EA2061BC9EABA00C980B7 /* FontWithFeatures.otf */; };
+                C23EA2091BC9F05100C980B7 /* FontWithFeatures.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = C23EA2071BC9EABA00C980B7 /* FontWithFeatures.ttf */; };
</ins><span class="cx">                 E1B7816511AF31B7007E1BC2 /* MockGeolocationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B7808711AF1669007E1BC2 /* MockGeolocationProvider.mm */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="lines">@@ -182,6 +184,8 @@
</span><span class="cx">                         dstPath = DumpRenderTree.resources;
</span><span class="cx">                         dstSubfolderSpec = 7;
</span><span class="cx">                         files = (
</span><ins>+                                C23EA2081BC9F05100C980B7 /* FontWithFeatures.otf in Copy Font Files */,
+                                C23EA2091BC9F05100C980B7 /* FontWithFeatures.ttf in Copy Font Files */,
</ins><span class="cx">                                 5DB9AC970F722C3600684641 /* AHEM____.TTF in Copy Font Files */,
</span><span class="cx">                                 8CCDA82A151A72D10003F937 /* SampleFont.sfont in Copy Font Files */,
</span><span class="cx">                                 5DB9AC980F722C3600684641 /* WebKitWeightWatcher100.ttf in Copy Font Files */,
</span><span class="lines">@@ -363,6 +367,8 @@
</span><span class="cx">                 C06F9ABB1267A7060058E1F6 /* PassDifferentNPPStruct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PassDifferentNPPStruct.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 C0E720741281C828004EF533 /* EvaluateJSAfterRemovingPluginElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EvaluateJSAfterRemovingPluginElement.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 C0EC3C9B12787F0500939164 /* NullNPPGetValuePointer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullNPPGetValuePointer.cpp; sourceTree = "<group>"; };
</span><ins>+                C23EA2061BC9EABA00C980B7 /* FontWithFeatures.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontWithFeatures.otf; path = fonts/FontWithFeatures.otf; sourceTree = "<group>"; };
+                C23EA2071BC9EABA00C980B7 /* FontWithFeatures.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontWithFeatures.ttf; path = fonts/FontWithFeatures.ttf; sourceTree = "<group>"; };
</ins><span class="cx">                 E1B7808511AF1643007E1BC2 /* MockGeolocationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MockGeolocationProvider.h; path = mac/MockGeolocationProvider.h; sourceTree = "<group>"; };
</span><span class="cx">                 E1B7808711AF1669007E1BC2 /* MockGeolocationProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MockGeolocationProvider.mm; path = mac/MockGeolocationProvider.mm; sourceTree = "<group>"; };
</span><span class="cx"> /* End PBXFileReference section */
</span><span class="lines">@@ -619,6 +625,8 @@
</span><span class="cx">                                 375F09770DAC3CB600C8B4E5 /* WebKitWeightWatcher700.ttf */,
</span><span class="cx">                                 375F09780DAC3CB600C8B4E5 /* WebKitWeightWatcher800.ttf */,
</span><span class="cx">                                 375F09790DAC3CB600C8B4E5 /* WebKitWeightWatcher900.ttf */,
</span><ins>+                                C23EA2061BC9EABA00C980B7 /* FontWithFeatures.otf */,
+                                C23EA2071BC9EABA00C980B7 /* FontWithFeatures.ttf */,
</ins><span class="cx">                         );
</span><span class="cx">                         name = Resources;
</span><span class="cx">                         sourceTree = "<group>";
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreefontsFontWithFeaturesotf"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf (0 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf         (rev 0)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+OTTO
+\x80 CFF Vy\xD6\xEB\xAC"OGSUB仅."\xFC\xBAOS/2H\xE0Yb'\xB8dcmap\xD5\xAF(jheadeD\xF9(\x886hheag7(\xC0$hmtx\xD4\x86(\xE4\xD4maxpk)\xB8 name\xD9u/\xEA)\xD8|post8T FontWithFeaturesOTF9\x87\x87\x85\xEEFontWithFeaturesOTF        
++ !"#$%&'()*+,-./012345I\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7        g
+
+\xA7G\xE7\x87+'+\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7 \x87\xFF\xFF\xFF\xFF\xC8\xFF\xC8\xFF\xFFX\xFFX\xFF\xFF\xFF\xFD\xA8\xFF\xFD\xA8\xFF\xFF\xFF\xFF\xFF\xC8\xFF\xF4\xFF2\xFF2\xFF\xFA\xFF\xFF\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFE>\xFF\xFE>\xFF\xFE\xD4\xFF,\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\x
FF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xF
F\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE
\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp
\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90
\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp
\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp
\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF
\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF
2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x
90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x
90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\x
FEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\
x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF
2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2
\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90
\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp
\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp
+Z\xD0DFLT\xFF\xFF        
++liga\xBCclig\xC2dlig\xC8hlig\xCEcalt\xD4subs\xDAsups\xE0smcp\xE6c2sc\xECpcap\xF2c2pc\xF8unic\xFEtitllnum
+onumpnumtnumfrac"afrc(ordn.zero4hist:jp78@jp83Fjp90Ljp04RsmplXtrad^fwiddpwidjrubyp        
++@HPX`hpx\x80\x88\x90\x98\xA0\xA8\xB0\xB8\xC0\xC8\xD0\xD8\xE0\xE8\xF0\xF8 (0\xF8\xFE
+"(.4:@FLRX^djpv|\x82\x88\x8E\x94\x9A\xA0\xA6\xAC        
++ !\xF4TKBW\xFF\xFFf\xFF\xFC\xFF\xFF \xFF\xFFD
+(AZaz&Zz\xFF\xFFAa\xFF\xFF\xFF\xDA\xFF\xA0^\xF7w`_<\xF5f5\xC8\xC82222222222222222222222222222222222222222222222222225\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF5B&&&&L&r\x98&\x9E\xC44\xE0<6P>\x860\xC42\xF4<&        >b.<\xA0
+2\xDC>@L+*\x8C*\xB6$\xE0$+"(J*f6\x908\xC6\xFE*6D8z\xB2*\xD0\xFA"\xFE* (Jr *\x90!2\xBA"2\xEC#$$*B%8l&4\xA4'\xD8(*\xF4)4*4R,,\x86-,\xB2/&\xDE0*        14        .24        b34        \x9644        \xCA5:        \xFE6<
+87
+t8*
+\x949.
+\xBE:2
+\xEC;<&8FontWithFeaturesOTFFontWithFeaturesOTFFontWithFeaturesOTFFontWithFeaturesOTF1.0FontWithFeaturesOTFkLigaturesTypekCommonLigaturesOnSelectorkContextualLigaturesOnSelectorkCommonLigaturesOffSelectorkContextualLigaturesOffSelectorkRareLigaturesOnSelectorkRareLigaturesOffSelectorkHistoricalLigaturesOnSelectorkHistoricalLigaturesOffSelectorkHistoricalLigaturesOnSelectorkContextualAlternatesTypekContextualAlternatesOnSelectorkContextualAlternatesOffSelectorkVerticalPositionTypede
faultUnusedSelectorkInferiorsSelectorkSuperiorsSelectorkOrdinalsSelectorkLowerCaseTypedefaultUnusedSelectorkLowerCaseSmallCapsSelectorkLowerCasePetiteCapsSelectorkUpperCaseTypedefaultUnusedSelectorkUpperCaseSmallCapsSelectorkUpperCasePetiteCapsSelectorkLetterCaseTypedefaultUnusedSelector14kStyleOptionsTypedefaultUnusedSelectorkTitlingCapsSelectorkNumberCaseTypedefaultUnusedSelectorkUpperCaseNumbersSelectorkLowerCaseNumbersSelectorkNumberSpacingTypedefaultUnusedSelectorkProportionalNumbersS
electorkMonospacedNumbersSelectorkFractionsTypedefaultUnusedSelectorkDiagonalFractionsSelectorkVerticalFractionsSelectorkTypographicExtrasTypekSlashedZeroOnSelectorkCharacterShapeTypedefaultUnusedSelectorkJIS1978CharactersSelectorkJIS1983CharactersSelectorkJIS1990CharactersSelectorkJIS2004CharactersSelectorkSimplifiedCharactersSelectorkTraditionalCharactersSelectorkTextSpacingTypedefaultUnusedSelectorkMonospacedTextSelectorkProportionalTextSelectorkRubyKanaTypekRubyKanaOnSelector
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreefontsFontWithFeaturesttffromrev193587branchessafari601146branchLayoutTestscss3resourcesFontWithFeaturesttf"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.ttf (from rev 193587, branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf) (0 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.ttf         (rev 0)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.ttf        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+true\x80@OS/2H\xE0Yb\xCCdcmap\xD5\xAF0jfeat\xA7Rp\x9Clglyf\xC8(\xD5\xC3headeD\xF9 6hheag7X$hmtx\xD4\x86|\xD4loca\xAB9P\xD8maxpk( morx\xC9BH@nameل/\xF4!\x88|post0 \xF4TKBW\xFF\xFFf\xFF\xFC\xFF\xFF \xFF\xFFD
+(AZaz&Zz\xFF\xFFAa\xFF\xFF\xFF\xDA\xFF\xA0        \xB4$\xD8
+
+\xE0\x80+%\xF0\x80&\xFC\x80\x80\x80\x80$\x80#0\x80'<,@\x80/\\x807h;        .c+ccccc !"c$%&c()*-c0123456c89:<\xC8\xC8 \xC8X\xFD\xA8\xC8X\xFD\xA8\xC8\xC8\xB6\xBC\xC82\xFA\x902\xFE>\xFE\xD4\xF42\xFF\x90\xFF\xCE\xFE>,22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\
xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\x
CE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xF
Ep\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xF
Ep\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xF
F\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE
\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90
\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp
2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x
90\x902\xFEp\xE5\xD7з_<\xF5f5\xC8\xC8222222222222222222222222222222222222222222222222222'X\xA7\xF6E\x94\xE32\x81\xD0n\xBD[\xAA\xF9H\x97\xE65\x84\xD3"q\xC0^\xAD\xFC        K        \x9A        \xE9
+8
+\x87
+\xD6%t\xC3a\xB0\xFF+N+\x9D+\xEC;\x8A\xD9(w\xC65\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF5.D\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFF        D\xFF\xFF\xFF\xFF
+D\xFF\xFF\xFF\xFFD$\xFF\xFF\xFF\xFFD$\xFF\xFF\xFF\xFF+D
+c\xFF\xFF\xFF\xFFD
+\xFF\xFF\xFF\xFFD
+\xFF\xFF\xFF\xFFD
+\xFF\xFF\xFF\xFFD%c\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD&c\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xF
F\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFF D\xFF\xFF\xFF\xFF!Dc\xFF\xFF\xFF\xFF"D\xFF\xFF\xFF\xFF#D\xFF\xFF\xFF\xFF$D\xFF\xFF\xFF\xFF%Dc\xFF\xFF\xFF\xFF&D\xFF\xFF\xFF\xFF'D\xFF\xFF\xFF\xFF(D\xFF\xFF\xFF\xFF
)D\xFF\xFF\xFF\xFF*D\xFF\xFF\xFF\xFF+D\xFF\xFF\xFF\xFF,Dc\xFF\xFF\xFF\xFF-D\xFF\xFF\xFF\xFF.D\xFF\xFF\xFF\xFF/D\xFF\xFF\xFF\xFF0B&&&&L&r\x98&\x9E\xC44\xE0<6P>\x860\xC42\xF4<&        >b.<\xA0
+2\xDC>@L+*\x8C*\xB6$\xE0$+"(J*f6\x908\xC6\xFE*6D8z\xB2*\xD0\xFA"\xFE* (Jr *\x90!2\xBA"2\xEC#$$*B%8l&4\xA4'\xD8(*\xF4)4*4R,,\x86-,\xB2/&\xDE0*        14        .24        b34        \x9644        \xCA5:        \xFE6<
+87
+t8*
+\x949.
+\xBE:2
+\xEC;<&8FontWithFeaturesTTFFontWithFeaturesTTFFontWithFeaturesTTFFontWithFeaturesTTF1.0FontWithFeaturesTTFkLigaturesTypekCommonLigaturesOnSelectorkContextualLigaturesOnSelectorkCommonLigaturesOffSelectorkContextualLigaturesOffSelectorkRareLigaturesOnSelectorkRareLigaturesOffSelectorkHistoricalLigaturesOnSelectorkHistoricalLigaturesOffSelectorkHistoricalLigaturesOnSelectorkContextualAlternatesTypekContextualAlternatesOnSelectorkContextualAlternatesOffSelectorkVerticalPositionTypede
faultUnusedSelectorkInferiorsSelectorkSuperiorsSelectorkOrdinalsSelectorkLowerCaseTypedefaultUnusedSelectorkLowerCaseSmallCapsSelectorkLowerCasePetiteCapsSelectorkUpperCaseTypedefaultUnusedSelectorkUpperCaseSmallCapsSelectorkUpperCasePetiteCapsSelectorkLetterCaseTypedefaultUnusedSelector14kStyleOptionsTypedefaultUnusedSelectorkTitlingCapsSelectorkNumberCaseTypedefaultUnusedSelectorkUpperCaseNumbersSelectorkLowerCaseNumbersSelectorkNumberSpacingTypedefaultUnusedSelectorkProportionalNumbersS
electorkMonospacedNumbersSelectorkFractionsTypedefaultUnusedSelectorkDiagonalFractionsSelectorkVerticalFractionsSelectorkTypographicExtrasTypekSlashedZeroOnSelectorkCharacterShapeTypedefaultUnusedSelectorkJIS1978CharactersSelectorkJIS1983CharactersSelectorkJIS1990CharactersSelectorkJIS2004CharactersSelectorkSimplifiedCharactersSelectorkTraditionalCharactersSelectorkTextSpacingTypedefaultUnusedSelectorkMonospacedTextSelectorkProportionalTextSelectorkRubyKanaTypekRubyKanaOnSelector
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreemacConfigurationsDumpRenderTreeAppxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA HiraMaruMono-W4 fonts/SampleFont.sfont;
</del><ins>+OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA HiraMaruMono-W4 fonts/SampleFont.sfont -sectcreate __DATA FontWithFeaturesTTF fonts/FontWithFeatures.ttf -sectcreate __DATA FontWithFeaturesOTF fonts/FontWithFeatures.otf;
</ins><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
</span><span class="cx"> PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -411,6 +411,8 @@
</span><span class="cx"> @"Verdana",
</span><span class="cx"> @"Webdings",
</span><span class="cx"> @"WebKit WeightWatcher",
</span><ins>+ @"FontWithFeaturesOTF",
+ @"FontWithFeaturesTTF",
</ins><span class="cx"> @"Wingdings 2",
</span><span class="cx"> @"Wingdings 3",
</span><span class="cx"> @"Wingdings",
</span><span class="lines">@@ -560,6 +562,8 @@
</span><span class="cx"> "WebKitWeightWatcher800.ttf",
</span><span class="cx"> "WebKitWeightWatcher900.ttf",
</span><span class="cx"> "SampleFont.sfont",
</span><ins>+ "FontWithFeatures.ttf",
+ "FontWithFeatures.otf",
</ins><span class="cx"> 0
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -630,6 +634,8 @@
</span><span class="cx"> fontData(WeightWatcher700);
</span><span class="cx"> fontData(WeightWatcher800);
</span><span class="cx"> fontData(WeightWatcher900);
</span><ins>+ fontData(FontWithFeaturesTTF);
+ fontData(FontWithFeaturesOTF);
</ins><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchToolsFontWithFeaturesFontWithFeaturesFontCreatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -295,6 +295,11 @@
</span><span class="cx"> public:
</span><span class="cx"> std::vector<uint8_t> generate(Type type)
</span><span class="cx"> {
</span><ins>+ if (type == Type::OpenType)
+ name = "FontWithFeaturesOTF";
+ else
+ name = "FontWithFeaturesTTF";
+
</ins><span class="cx"> featureDescription = generateFeatureDescription();
</span><span class="cx">
</span><span class="cx"> uint16_t numTables = type == Type::OpenType ? 10 : 12;
</span><span class="lines">@@ -572,7 +577,7 @@
</span><span class="cx"> result.push_back(4); // Offsets within CFF table are 4 bytes long
</span><span class="cx">
</span><span class="cx"> // Name INDEX
</span><del>- std::string fontName = "MylesFont";
</del><ins>+ std::string fontName = name;
</ins><span class="cx"> append16(1); // INDEX contains 1 element
</span><span class="cx"> result.push_back(4); // Offsets in this INDEX are 4 bytes long
</span><span class="cx"> append32(1); // 1-index offset of name data
</span><span class="lines">@@ -1082,8 +1087,8 @@
</span><span class="cx"> append16(0); // Unicode
</span><span class="cx"> append16(3); // Unicode version 2.0 or later
</span><span class="cx"> append16(0); // Language
</span><del>- append16(m_baseStringIndex + nameIdentifier); // Name identifier
- append16(s.length());
</del><ins>+ append16(nameIdentifier); // Name identifier
+ append16(s.length() * 2); // Code units get 2 bytes each
</ins><span class="cx"> append16(m_nameOffset); // Offset into name data
</span><span class="cx"> m_nameOffset += s.size() * 2; // Code units get 2 bytes each
</span><span class="cx"> }
</span><span class="lines">@@ -1096,21 +1101,32 @@
</span><span class="cx">
</span><span class="cx"> void appendNAMETable()
</span><span class="cx"> {
</span><del>- std::string familyName = "MylesFont"; // 1: Font Family
</del><ins>+ std::string familyName = name; // 1: Font Family
+ std::string version = "1.0";
</ins><span class="cx">
</span><del>- uint16_t numberOfRecords = m_stringIndex + 1;
</del><ins>+ uint16_t numberOfRecords = m_stringIndex + 6;
</ins><span class="cx"> append16(0); // Format selector
</span><span class="cx"> append16(numberOfRecords); // Number of name records in table
</span><span class="cx"> append16(6 + 12 * numberOfRecords); // Offset in bytes to the beginning of name character strings
</span><span class="cx">
</span><del>- appendNameSubtable(familyName, 1); // 1: Font Family
</del><ins>+ appendNameSubtable(familyName, 1); // 1: Font Family.
+ appendNameSubtable(familyName, 2); // 2: Font Subfamily.
+ appendNameSubtable(familyName, 3); // 3: Unique subfamily identification.
+ appendNameSubtable(familyName, 4); // 4: Full name of the font.
+ appendNameSubtable(version, 5); // 5: Version of the name table.
+ appendNameSubtable(familyName, 6); // 6: PostScript name of the font.
</ins><span class="cx"> for (FeatureType& type : featureDescription) {
</span><del>- appendNameSubtable(type.name, type.stringIndex);
</del><ins>+ appendNameSubtable(type.name, m_baseStringIndex + type.stringIndex);
</ins><span class="cx"> for (FeatureSelector& selector : type.selectors)
</span><del>- appendNameSubtable(selector.name, selector.stringIndex);
</del><ins>+ appendNameSubtable(selector.name, m_baseStringIndex + selector.stringIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> append2ByteASCIIString(familyName);
</span><ins>+ append2ByteASCIIString(familyName);
+ append2ByteASCIIString(familyName);
+ append2ByteASCIIString(familyName);
+ append2ByteASCIIString(version);
+ append2ByteASCIIString(familyName);
</ins><span class="cx"> for (FeatureType& type : featureDescription) {
</span><span class="cx"> append2ByteASCIIString(type.name);
</span><span class="cx"> for (FeatureSelector& selector : type.selectors)
</span><span class="lines">@@ -1171,6 +1187,7 @@
</span><span class="cx"> uint16_t m_stringIndex { 0 };
</span><span class="cx"> std::vector<FeatureType> featureDescription;
</span><span class="cx"> std::vector<uint8_t> result;
</span><ins>+ std::string name;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> std::vector<uint8_t> generateFont(Type type)
</span></span></pre></div>
<a id="branchessafari601146branchToolsFontWithFeaturesFontWithFeaturesmaincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> CGColorSpaceRelease(colorSpace);
</span><span class="cx"> Type type = Type::TrueType;
</span><span class="cx"> const std::vector<uint8_t> fontVector = generateFont(type);
</span><del>- std::ofstream outputFile("/Volumes/Data/home/mmaxfield/tmp/output.ttf", std::ios::out | std::ios::binary);
</del><ins>+ std::ofstream outputFile("/Volumes/Data/home/mmaxfield/src/WebKit/OpenSource/LayoutTests/css3/resources/FontWithFeatures.ttf", std::ios::out | std::ios::binary);
</ins><span class="cx"> for (uint8_t b : fontVector)
</span><span class="cx"> outputFile << b;
</span><span class="cx"> outputFile.close();
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerFontWithFeaturesotf"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.otf (0 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.otf         (rev 0)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.otf        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+OTTO
+\x80 CFF Vy\xD6\xEB\xAC"OGSUB仅."\xFC\xBAOS/2H\xE0Yb'\xB8dcmap\xD5\xAF(jheadeD\xF9(\x886hheag7(\xC0$hmtx\xD4\x86(\xE4\xD4maxpk)\xB8 name\xD9u/\xEA)\xD8|post8T FontWithFeaturesOTF9\x87\x87\x85\xEEFontWithFeaturesOTF        
++ !"#$%&'()*+,-./012345I\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7        g
+
+\xA7G\xE7\x87+'+\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7 \x87\xFF\xFF\xFF\xFF\xC8\xFF\xC8\xFF\xFFX\xFFX\xFF\xFF\xFF\xFD\xA8\xFF\xFD\xA8\xFF\xFF\xFF\xFF\xFF\xC8\xFF\xF4\xFF2\xFF2\xFF\xFA\xFF\xFF\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFE>\xFF\xFE>\xFF\xFE\xD4\xFF,\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\x
FF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xF
F\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE
\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp
\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90
\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp
\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp
\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF
\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF
2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x
90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x
90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\x
FEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\
x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF
2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2
\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90
\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp
\xFF\xFF\xFF\xFF\xF4\xFF&\xFF\x90\xFF\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF\x90\xFF\x90\xFF\xFEp\xFF\x90\xFF2\xFF2\xFF\x90\xFF\xFEp
+Z\xD0DFLT\xFF\xFF        
++liga\xBCclig\xC2dlig\xC8hlig\xCEcalt\xD4subs\xDAsups\xE0smcp\xE6c2sc\xECpcap\xF2c2pc\xF8unic\xFEtitllnum
+onumpnumtnumfrac"afrc(ordn.zero4hist:jp78@jp83Fjp90Ljp04RsmplXtrad^fwiddpwidjrubyp        
++@HPX`hpx\x80\x88\x90\x98\xA0\xA8\xB0\xB8\xC0\xC8\xD0\xD8\xE0\xE8\xF0\xF8 (0\xF8\xFE
+"(.4:@FLRX^djpv|\x82\x88\x8E\x94\x9A\xA0\xA6\xAC        
++ !\xF4TKBW\xFF\xFFf\xFF\xFC\xFF\xFF \xFF\xFFD
+(AZaz&Zz\xFF\xFFAa\xFF\xFF\xFF\xDA\xFF\xA0^\xF7w`_<\xF5f5\xC8\xC82222222222222222222222222222222222222222222222222225\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF5B&&&&L&r\x98&\x9E\xC44\xE0<6P>\x860\xC42\xF4<&        >b.<\xA0
+2\xDC>@L+*\x8C*\xB6$\xE0$+"(J*f6\x908\xC6\xFE*6D8z\xB2*\xD0\xFA"\xFE* (Jr *\x90!2\xBA"2\xEC#$$*B%8l&4\xA4'\xD8(*\xF4)4*4R,,\x86-,\xB2/&\xDE0*        14        .24        b34        \x9644        \xCA5:        \xFE6<
+87
+t8*
+\x949.
+\xBE:2
+\xEC;<&8FontWithFeaturesOTFFontWithFeaturesOTFFontWithFeaturesOTFFontWithFeaturesOTF1.0FontWithFeaturesOTFkLigaturesTypekCommonLigaturesOnSelectorkContextualLigaturesOnSelectorkCommonLigaturesOffSelectorkContextualLigaturesOffSelectorkRareLigaturesOnSelectorkRareLigaturesOffSelectorkHistoricalLigaturesOnSelectorkHistoricalLigaturesOffSelectorkHistoricalLigaturesOnSelectorkContextualAlternatesTypekContextualAlternatesOnSelectorkContextualAlternatesOffSelectorkVerticalPositionTypede
faultUnusedSelectorkInferiorsSelectorkSuperiorsSelectorkOrdinalsSelectorkLowerCaseTypedefaultUnusedSelectorkLowerCaseSmallCapsSelectorkLowerCasePetiteCapsSelectorkUpperCaseTypedefaultUnusedSelectorkUpperCaseSmallCapsSelectorkUpperCasePetiteCapsSelectorkLetterCaseTypedefaultUnusedSelector14kStyleOptionsTypedefaultUnusedSelectorkTitlingCapsSelectorkNumberCaseTypedefaultUnusedSelectorkUpperCaseNumbersSelectorkLowerCaseNumbersSelectorkNumberSpacingTypedefaultUnusedSelectorkProportionalNumbersS
electorkMonospacedNumbersSelectorkFractionsTypedefaultUnusedSelectorkDiagonalFractionsSelectorkVerticalFractionsSelectorkTypographicExtrasTypekSlashedZeroOnSelectorkCharacterShapeTypedefaultUnusedSelectorkJIS1978CharactersSelectorkJIS1983CharactersSelectorkJIS1990CharactersSelectorkJIS2004CharactersSelectorkSimplifiedCharactersSelectorkTraditionalCharactersSelectorkTextSpacingTypedefaultUnusedSelectorkMonospacedTextSelectorkProportionalTextSelectorkRubyKanaTypekRubyKanaOnSelector
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerFontWithFeaturesttffromrev193587branchessafari601146branchLayoutTestscss3resourcesFontWithFeaturesttf"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.ttf (from rev 193587, branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf) (0 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.ttf         (rev 0)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/FontWithFeatures.ttf        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+true\x80@OS/2H\xE0Yb\xCCdcmap\xD5\xAF0jfeat\xA7Rp\x9Clglyf\xC8(\xD5\xC3headeD\xF9 6hheag7X$hmtx\xD4\x86|\xD4loca\xAB9P\xD8maxpk( morx\xC9BH@nameل/\xF4!\x88|post0 \xF4TKBW\xFF\xFFf\xFF\xFC\xFF\xFF \xFF\xFFD
+(AZaz&Zz\xFF\xFFAa\xFF\xFF\xFF\xDA\xFF\xA0        \xB4$\xD8
+
+\xE0\x80+%\xF0\x80&\xFC\x80\x80\x80\x80$\x80#0\x80'<,@\x80/\\x807h;        .c+ccccc !"c$%&c()*-c0123456c89:<\xC8\xC8 \xC8X\xFD\xA8\xC8X\xFD\xA8\xC8\xC8\xB6\xBC\xC82\xFA\x902\xFE>\xFE\xD4\xF42\xFF\x90\xFF\xCE\xFE>,22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\
xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\x
CE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xF
Ep\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xF
Ep\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xF
F\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE
\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90
\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp
2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90\x902\xFEp22\xB6\xB6\xF4\x902\xFEp\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x90&\x90\xFF\xCE\xFEp\xFEp\xFF\xCE\x90\xFEp2\x
90\x902\xFEp\xE5\xD7з_<\xF5f5\xC8\xC8222222222222222222222222222222222222222222222222222'X\xA7\xF6E\x94\xE32\x81\xD0n\xBD[\xAA\xF9H\x97\xE65\x84\xD3"q\xC0^\xAD\xFC        K        \x9A        \xE9
+8
+\x87
+\xD6%t\xC3a\xB0\xFF+N+\x9D+\xEC;\x8A\xD9(w\xC65\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF5.D\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFF        D\xFF\xFF\xFF\xFF
+D\xFF\xFF\xFF\xFFD$\xFF\xFF\xFF\xFFD$\xFF\xFF\xFF\xFF+D
+c\xFF\xFF\xFF\xFFD
+\xFF\xFF\xFF\xFFD
+\xFF\xFF\xFF\xFFD
+\xFF\xFF\xFF\xFFD%c\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD%\xFF\xFF\xFF\xFFD&c\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFD&\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xF
F\xFFD\xFF\xFF\xFF\xFFDc\xFF\xFF\xFF\xFFD\xFF\xFF\xFF\xFF D\xFF\xFF\xFF\xFF!Dc\xFF\xFF\xFF\xFF"D\xFF\xFF\xFF\xFF#D\xFF\xFF\xFF\xFF$D\xFF\xFF\xFF\xFF%Dc\xFF\xFF\xFF\xFF&D\xFF\xFF\xFF\xFF'D\xFF\xFF\xFF\xFF(D\xFF\xFF\xFF\xFF
)D\xFF\xFF\xFF\xFF*D\xFF\xFF\xFF\xFF+D\xFF\xFF\xFF\xFF,Dc\xFF\xFF\xFF\xFF-D\xFF\xFF\xFF\xFF.D\xFF\xFF\xFF\xFF/D\xFF\xFF\xFF\xFF0B&&&&L&r\x98&\x9E\xC44\xE0<6P>\x860\xC42\xF4<&        >b.<\xA0
+2\xDC>@L+*\x8C*\xB6$\xE0$+"(J*f6\x908\xC6\xFE*6D8z\xB2*\xD0\xFA"\xFE* (Jr *\x90!2\xBA"2\xEC#$$*B%8l&4\xA4'\xD8(*\xF4)4*4R,,\x86-,\xB2/&\xDE0*        14        .24        b34        \x9644        \xCA5:        \xFE6<
+87
+t8*
+\x949.
+\xBE:2
+\xEC;<&8FontWithFeaturesTTFFontWithFeaturesTTFFontWithFeaturesTTFFontWithFeaturesTTF1.0FontWithFeaturesTTFkLigaturesTypekCommonLigaturesOnSelectorkContextualLigaturesOnSelectorkCommonLigaturesOffSelectorkContextualLigaturesOffSelectorkRareLigaturesOnSelectorkRareLigaturesOffSelectorkHistoricalLigaturesOnSelectorkHistoricalLigaturesOffSelectorkHistoricalLigaturesOnSelectorkContextualAlternatesTypekContextualAlternatesOnSelectorkContextualAlternatesOffSelectorkVerticalPositionTypede
faultUnusedSelectorkInferiorsSelectorkSuperiorsSelectorkOrdinalsSelectorkLowerCaseTypedefaultUnusedSelectorkLowerCaseSmallCapsSelectorkLowerCasePetiteCapsSelectorkUpperCaseTypedefaultUnusedSelectorkUpperCaseSmallCapsSelectorkUpperCasePetiteCapsSelectorkLetterCaseTypedefaultUnusedSelector14kStyleOptionsTypedefaultUnusedSelectorkTitlingCapsSelectorkNumberCaseTypedefaultUnusedSelectorkUpperCaseNumbersSelectorkLowerCaseNumbersSelectorkNumberSpacingTypedefaultUnusedSelectorkProportionalNumbersS
electorkMonospacedNumbersSelectorkFractionsTypedefaultUnusedSelectorkDiagonalFractionsSelectorkVerticalFractionsSelectorkTypographicExtrasTypekSlashedZeroOnSelectorkCharacterShapeTypedefaultUnusedSelectorkJIS1978CharactersSelectorkJIS1983CharactersSelectorkJIS1990CharactersSelectorkJIS2004CharactersSelectorkSimplifiedCharactersSelectorkTraditionalCharactersSelectorkTextSpacingTypedefaultUnusedSelectorkMonospacedTextSelectorkProportionalTextSelectorkRubyKanaTypekRubyKanaOnSelector
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerInjectedBundlecocoaActivateFontsCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -161,6 +161,8 @@
</span><span class="cx"> @"Verdana",
</span><span class="cx"> @"Webdings",
</span><span class="cx"> @"WebKit WeightWatcher",
</span><ins>+ @"FontWithFeaturesOTF",
+ @"FontWithFeaturesTTF",
</ins><span class="cx"> @"Wingdings 2",
</span><span class="cx"> @"Wingdings 3",
</span><span class="cx"> @"Wingdings",
</span><span class="lines">@@ -301,6 +303,8 @@
</span><span class="cx"> "WebKitWeightWatcher800.ttf",
</span><span class="cx"> "WebKitWeightWatcher900.ttf",
</span><span class="cx"> "SampleFont.sfont",
</span><ins>+ "FontWithFeatures.otf",
+ "FontWithFeatures.ttf",
</ins><span class="cx"> 0
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">                 0FEB90A81905C537000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; };
</span><span class="cx">                 0FEB90A91905C548000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; };
</span><span class="cx">                 26D758E7160BECDD00268472 /* GeolocationProviderMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */; };
</span><ins>+                1CA211C91BCA107300B2101F /* FontWithFeatures.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1CA211C71BCA107300B2101F /* FontWithFeatures.otf */; };
+                1CA211CA1BCA107300B2101F /* FontWithFeatures.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1CA211C81BCA107300B2101F /* FontWithFeatures.ttf */; };
</ins><span class="cx">                 29210EAE144CACB700835BB5 /* AccessibilityUIElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EA9144CACB200835BB5 /* AccessibilityUIElement.cpp */; };
</span><span class="cx">                 29210EB0144CACBD00835BB5 /* AccessibilityController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EA2144CAAA500835BB5 /* AccessibilityController.cpp */; };
</span><span class="cx">                 29210EB4144CACD500835BB5 /* AccessibilityTextMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EB1144CACD400835BB5 /* AccessibilityTextMarker.cpp */; };
</span><span class="lines">@@ -147,6 +149,8 @@
</span><span class="cx">                 0FEB909E1905A776000FDBF3 /* InjectedBundlePageCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundlePageCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx">                 0FEB90A21905BC6A000FDBF3 /* CrashReporterInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrashReporterInfo.h; path = cocoa/CrashReporterInfo.h; sourceTree = "<group>"; };
</span><span class="cx">                 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CrashReporterInfo.mm; path = cocoa/CrashReporterInfo.mm; sourceTree = "<group>"; };
</span><ins>+                1CA211C71BCA107300B2101F /* FontWithFeatures.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontWithFeatures.otf; sourceTree = "<group>"; };
+                1CA211C81BCA107300B2101F /* FontWithFeatures.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontWithFeatures.ttf; sourceTree = "<group>"; };
</ins><span class="cx">                 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationProviderMock.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 26D758E6160BECDD00268472 /* GeolocationProviderMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationProviderMock.h; sourceTree = "<group>"; };
</span><span class="cx">                 29210EA2144CAAA500835BB5 /* AccessibilityController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityController.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -547,6 +551,8 @@
</span><span class="cx">                                 6510A77F11EC643800410867 /* WebKitWeightWatcher700.ttf */,
</span><span class="cx">                                 6510A78011EC643800410867 /* WebKitWeightWatcher800.ttf */,
</span><span class="cx">                                 6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */,
</span><ins>+                                1CA211C71BCA107300B2101F /* FontWithFeatures.otf */,
+                                1CA211C81BCA107300B2101F /* FontWithFeatures.ttf */,
</ins><span class="cx">                         );
</span><span class="cx">                         name = Resources;
</span><span class="cx">                         sourceTree = "<group>";
</span><span class="lines">@@ -746,6 +752,7 @@
</span><span class="cx">                                 6510A78211EC643800410867 /* AHEM____.TTF in Resources */,
</span><span class="cx">                                 8CCDA823151A570B0003F937 /* SampleFont.sfont in Resources */,
</span><span class="cx">                                 6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources */,
</span><ins>+                                1CA211CA1BCA107300B2101F /* FontWithFeatures.ttf in Resources */,
</ins><span class="cx">                                 6510A78511EC643800410867 /* WebKitWeightWatcher200.ttf in Resources */,
</span><span class="cx">                                 6510A78611EC643800410867 /* WebKitWeightWatcher300.ttf in Resources */,
</span><span class="cx">                                 6510A78711EC643800410867 /* WebKitWeightWatcher400.ttf in Resources */,
</span><span class="lines">@@ -753,6 +760,7 @@
</span><span class="cx">                                 6510A78911EC643800410867 /* WebKitWeightWatcher600.ttf in Resources */,
</span><span class="cx">                                 6510A78A11EC643800410867 /* WebKitWeightWatcher700.ttf in Resources */,
</span><span class="cx">                                 6510A78B11EC643800410867 /* WebKitWeightWatcher800.ttf in Resources */,
</span><ins>+                                1CA211C91BCA107300B2101F /* FontWithFeatures.otf in Resources */,
</ins><span class="cx">                                 6510A78C11EC643800410867 /* WebKitWeightWatcher900.ttf in Resources */,
</span><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/TestControllerMac.mm (193588 => 193589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/TestControllerMac.mm        2015-12-06 21:48:19 UTC (rev 193588)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/TestControllerMac.mm        2015-12-06 21:53:53 UTC (rev 193589)
</span><span class="lines">@@ -263,6 +263,8 @@
</span><span class="cx"> @"Verdana",
</span><span class="cx"> @"Webdings",
</span><span class="cx"> @"WebKit WeightWatcher",
</span><ins>+ @"FontWithFeaturesOTF",
+ @"FontWithFeaturesTTF",
</ins><span class="cx"> @"Wingdings 2",
</span><span class="cx"> @"Wingdings 3",
</span><span class="cx"> @"Wingdings",
</span></span></pre>
</div>
</div>
</body>
</html>