<!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>[195988] branches/safari-601-branch/LayoutTests</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/195988">195988</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 16:32:45 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge Layout Tests for <a href="http://trac.webkit.org/projects/webkit/changeset/191331">r191331</a>. rdar://problem/24448992</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfasttextmultiplefeaturepropertiesexpectedhtml">branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextmultiplefeaturepropertieshtml">branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (195987 => 195988)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-02-02 00:20:37 UTC (rev 195987)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-02-02 00:32:45 UTC (rev 195988)
</span><span class="lines">@@ -1,31 +1,32 @@
</span><span class="cx"> 2016-02-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><del>- Merge r195837. rdar://problem/24002220
</del><ins>+ Merge Layout Tests for r191331. rdar://problem/24448992
</ins><span class="cx">
</span><del>- 2015-12-22 Pranjal Jumde <pjumde@apple.com>
</del><ins>+ 2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
</ins><span class="cx">
</span><del>- Test to check for stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
- https://bugs.webkit.org/show_bug.cgi?id=149179
- <rdar://problem/22708019>.
</del><ins>+ FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149775
</ins><span class="cx">
</span><del>- Reviewed by Dean Jackson.
</del><ins>+ Reviewed by Darin Adler.
</ins><span class="cx">
</span><del>- * storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt: Added.
- * storage/domstorage/localstorage/delete-defineproperty-removal.html: Added.
</del><ins>+ * fast/text/multiple-feature-properties-expected.html: Added.
+ * fast/text/multiple-feature-properties.html: Added.
</ins><span class="cx">
</span><del>-<<<<<<< .mine
-2016-01-29 Brent Fulgham <bfulgham@apple.com>
</del><ins>+2016-02-01 Matthew Hanson <matthew_hanson@apple.com>
</ins><span class="cx">
</span><del>- [WebGL] Check vertex array bounds before permitting a glDrawArrays to execute
- https://bugs.webkit.org/show_bug.cgi?id=153643
- <rdar://problem/23424456>
</del><ins>+ Merge r195837. rdar://problem/24002220
</ins><span class="cx">
</span><del>- Reviewed by Dean Jackson.
</del><ins>+ 2016-01-29 Brent Fulgham <bfulgham@apple.com>
</ins><span class="cx">
</span><del>- * fast/canvas/webgl/webgl-drawarrays-crash-expected.txt: Added.
- * fast/canvas/webgl/webgl-drawarrays-crash.html: Added.
</del><ins>+ [WebGL] Check vertex array bounds before permitting a glDrawArrays to execute
+ https://bugs.webkit.org/show_bug.cgi?id=153643
+ <rdar://problem/23424456>
</ins><span class="cx">
</span><del>-=======
</del><ins>+ Reviewed by Dean Jackson.
+
+ * fast/canvas/webgl/webgl-drawarrays-crash-expected.txt: Added.
+ * fast/canvas/webgl/webgl-drawarrays-crash.html: Added.
+
</ins><span class="cx"> 2016-01-29 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195615.
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextmultiplefeaturepropertiesexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html (0 => 195988)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html 2016-02-02 00:32:45 UTC (rev 195988)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that feature resolution order is honored. For more information, click <a href="http://www.w3.org/TR/css3-fonts/#feature-precedence">here</a>. The test passes if there is a particular sequence of Xs and check marks below.
+<div style="font-family: FontWithFeaturesOTF;">
+<span>B</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>B</span>
+<span>A</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextmultiplefeaturepropertieshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html (0 => 195988)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/multiple-feature-properties.html 2016-02-02 00:32:45 UTC (rev 195988)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that feature resolution order is honored. For more information, click <a href="http://www.w3.org/TR/css3-fonts/#feature-precedence">here</a>. The test passes if there is a particular sequence of Xs and check marks below.
+<div style="font-family: FontWithFeaturesOTF;">
+<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeSpeed;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeSpeed;">C</span>
+<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeLegibility;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeLegibility;">C</span>
+<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeSpeed;">C</span>
+<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeSpeed;">C</span>
+<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeLegibility;">C</span>
+<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeLegibility;">C</span>
+<span style="font-variant-ligatures: common-ligatures; font-feature-settings: 'liga' 0, 'clig' 0;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; font-feature-settings: 'liga' 1, 'clig' 1;">C</span>
+</div>
+</body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>