<!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>[207568] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207568">207568</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-10-19 14:14:04 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207557">r207557</a>.
This change caused animations/font-variations tests to time
out on pre-Sierra Macs.
Reverted changeset:
"[macOS] [iOS] Disable variation fonts on macOS El Capitan and
iOS 9"
https://bugs.webkit.org/show_bug.cgi?id=163374
http://trac.webkit.org/changeset/207557</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsfontvariationsettingsexpectedhtml">trunk/LayoutTests/animations/font-variation-settings-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsettingsorderexpectedhtml">trunk/LayoutTests/animations/font-variation-settings-order-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsettingsorderhtml">trunk/LayoutTests/animations/font-variation-settings-order.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsettingsunlikeexpectedhtml">trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsettingsunlikehtml">trunk/LayoutTests/animations/font-variation-settings-unlike.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsettingshtml">trunk/LayoutTests/animations/font-variation-settings.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/animations/font-variations/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
</ins><span class="cx"> 2016-10-19 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: crash: com.apple.WebCore: WebCore::AccessibilityObject::findMatchingObjects + 600
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsexpectedhtmlfromrev207567trunkLayoutTestsanimationsfontvariationsfontvariationsettingsexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variation-settings-expected.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html) (0 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-expected.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-expected.html 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font: 100px 'Skia'; font-variation-settings: 'wght' 2.3">Hello</div>
+<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: 'wght' 0.95<br>
+PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 1.4<br>
+PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 2.3</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsorderexpectedhtmlfromrev207567trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variation-settings-order-expected.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html) (0 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-order-expected.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-order-expected.html 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font: 100px 'Skia'; font-variation-settings: 'wght' 2.3, 'wdth' 1.1">Hello</div>
+<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: 'wght' 0.95, 'wdth' 0.95<br>
+PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 1.4, 'wdth' 1<br>
+PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 2.3, 'wdth' 1.1</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsorderhtmlfromrev207567trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variation-settings-order.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html) (0 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-order.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-order.html 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script src="resources/animation-test-helpers.js"></script>
+<style>
+@keyframes "weightAnimation" {
+ from {
+ font-variation-settings: "wght" 0.5, "wdth" 0.9;
+ }
+ to {
+ font-variation-settings: "wdth" 1.2, "wght" 3.2;
+ }
+}
+
+#box {
+ font: 100px "Skia";
+ animation-name: "weightAnimation";
+ animation-duration: 3s;
+ animation-timing-function: linear;
+}
+</style>
+</head>
+<body>
+<div id="box">Hello</div>
+<div id="result"></div>
+<script>
+var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["weightAnimation", 0.5, "box", "font-variation-settings", "'wght' 0.95, 'wdth' 0.95", 0.05],
+ ["weightAnimation", 1.0, "box", "font-variation-settings", "'wght' 1.4, 'wdth' 1", 0.05],
+ ["weightAnimation", 2.0, "box", "font-variation-settings", "'wght' 2.3, 'wdth' 1.1", 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsunlikeexpectedhtmlfromrev207567trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikeexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html) (0 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font: 100px 'Skia';">Hello</div>
+<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: normal<br>
+PASS - "font-variation-settings" property for "box" element at 1s saw something close to: normal<br>
+PASS - "font-variation-settings" property for "box" element at 2s saw something close to: normal</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsunlikehtmlfromrev207567trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variation-settings-unlike.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html) (0 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-unlike.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-unlike.html 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script src="resources/animation-test-helpers.js"></script>
+<style>
+@keyframes "weightAnimation" {
+ from {
+ font-variation-settings: "wght" 0.5, "wdth" 0.9;
+ }
+ to {
+ font-variation-settings: "wght" 3.2;
+ }
+}
+
+#box {
+ font: 100px "Skia";
+ animation-name: "weightAnimation";
+ animation-duration: 3s;
+ animation-timing-function: linear;
+}
+</style>
+</head>
+<body>
+<div id="box">Hello</div>
+<div id="result"></div>
+<script>
+var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["weightAnimation", 0.5, "box", "font-variation-settings", "normal", 0.05],
+ ["weightAnimation", 1.0, "box", "font-variation-settings", "normal", 0.05],
+ ["weightAnimation", 2.0, "box", "font-variation-settings", "normal", 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingshtmlfromrev207567trunkLayoutTestsanimationsfontvariationsfontvariationsettingshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variation-settings.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings.html) (0 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings.html 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script src="resources/animation-test-helpers.js"></script>
+<style>
+@keyframes "weightAnimation" {
+ from {
+ font-variation-settings: "wght" 0.5;
+ }
+ to {
+ font-variation-settings: "wght" 3.2;
+ }
+}
+
+#box {
+ font: 100px "Skia";
+ animation-name: "weightAnimation";
+ animation-duration: 3s;
+ animation-timing-function: linear;
+}
+</style>
+</head>
+<body>
+<div id="box">Hello</div>
+<div id="result"></div>
+<script>
+var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["weightAnimation", 0.5, "box", "font-variation-settings", "'wght' 0.95", 0.05],
+ ["weightAnimation", 1.0, "box", "font-variation-settings", "'wght' 1.4", 0.05],
+ ["weightAnimation", 2.0, "box", "font-variation-settings", "'wght' 2.3", 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -721,9 +721,9 @@
</span><span class="cx">
</span><span class="cx"> # Font variations build flag is turned off
</span><span class="cx"> webkit.org/b/162815 fast/text/variations/ [ Skip ]
</span><del>-webkit.org/b/162815 animations/font-variations/font-variation-settings-unlike.html [ ImageOnlyFailure ]
-webkit.org/b/162815 animations/font-variations/font-variation-settings-order.html [ Timeout ]
-webkit.org/b/162815 animations/font-variations/font-variation-settings.html [ Timeout ]
</del><ins>+webkit.org/b/162815 animations/font-variation-settings-unlike.html [ ImageOnlyFailure ]
+webkit.org/b/162815 animations/font-variation-settings-order.html [ Timeout ]
+webkit.org/b/162815 animations/font-variation-settings.html [ Timeout ]
</ins><span class="cx">
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Expected failures
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -2711,10 +2711,3 @@
</span><span class="cx"> webkit.org/b/163307 [ Debug ] loader/stateobjects/pushstate-size.html [ Skip ]
</span><span class="cx"> webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size-iframe.html [ Skip ]
</span><span class="cx"> webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
</span><del>-
-# These font variation tests require a variation font which supports more than 2 axes.
-animations/font-variations/font-variation-settings-order.html [ Pass ImageOnlyFailure Failure ]
-animations/font-variations/font-variation-settings-unlike.html [ Pass ImageOnlyFailure Failure ]
-
-webkit.org/b/163632 animations/font-variations/font-variation-settings.html [ Skip ]
-webkit.org/b/163632 fast/text/variations/getComputedStyle.html [ Skip ]
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1465,10 +1465,7 @@
</span><span class="cx">
</span><span class="cx"> # rdar://problem/28586837
</span><span class="cx"> fast/text/variations/order.html [ Crash ]
</span><del>-animations/font-variations/font-variation-settings-order.html [ Crash ]
-# Variation fonts are not implemented earlier than Sierra.
-[ ElCapitan Yosemite ] fast/text/variations [ Pass Failure ImageOnlyFailure ]
-[ ElCapitan Yosemite ] animations/font-variations [ Pass Failure ImageOnlyFailure ]
</del><ins>+animations/font-variation-settings-order.html [ Crash ]
</ins><span class="cx">
</span><span class="cx"> [ Debug ] fast/selectors/slow-style-sharing-with-long-cousin-list.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
</ins><span class="cx"> 2016-10-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Baseline JIT should use AutomaticThread
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
</del><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="lines">@@ -44,13 +40,10 @@
</span><span class="cx"> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
</span><ins>+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
</ins><span class="cx">
</span><del>-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
</del><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><span class="cx"> ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="lines">@@ -206,16 +199,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
</del><ins>+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</ins><span class="cx">
</span><del>-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
</del><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
</ins><span class="cx"> 2016-10-19 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Support -webkit-border-fit
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
</del><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="lines">@@ -44,13 +40,10 @@
</span><span class="cx"> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
</span><ins>+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
</ins><span class="cx">
</span><del>-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
</del><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><span class="cx"> ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="lines">@@ -206,16 +199,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
</del><ins>+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</ins><span class="cx">
</span><del>-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
</del><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
</ins><span class="cx"> 2016-10-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move HTML Interactive Form Validation behind an experimental flag
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
</del><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="lines">@@ -44,13 +40,10 @@
</span><span class="cx"> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
</span><ins>+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
</ins><span class="cx">
</span><del>-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
</del><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><span class="cx"> ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="lines">@@ -206,16 +199,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
</del><ins>+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</ins><span class="cx">
</span><del>-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
</del><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
</ins><span class="cx"> 2016-10-19 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
</del><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="lines">@@ -44,13 +40,10 @@
</span><span class="cx"> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
</span><ins>+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
</ins><span class="cx">
</span><del>-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
</del><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><span class="cx"> ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="lines">@@ -206,16 +199,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
</del><ins>+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</ins><span class="cx">
</span><del>-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
</del><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Tools/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
</ins><span class="cx"> 2016-10-19 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (207567 => 207568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> // Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
</del><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><span class="lines">@@ -44,13 +40,10 @@
</span><span class="cx"> ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
</span><span class="cx"> ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
</span><ins>+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
</ins><span class="cx">
</span><del>-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
</del><span class="cx"> ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</span><span class="cx"> ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
</span><span class="lines">@@ -206,16 +199,6 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
</del><ins>+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</ins><span class="cx">
</span><del>-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
</del><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</span></span></pre>
</div>
</div>
</body>
</html>