<!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>[207642] 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/207642">207642</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 16:05:53 -0700 (Thu, 20 Oct 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
https://bugs.webkit.org/show_bug.cgi?id=163374

Reviewed by Darin Adler.

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Because of platform lack of support for variations in in-memory fonts,
this feature should be disabled on the affected OSes.

No tests because there is no behavior change (on the relevant platforms).

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

LayoutTests:

Moving animations/font-variation-settings* tests to animations/font-variations
in order to make them easier to mark as failing.

Mark the relevant tests as failing on El Capitan and iOS 9.

* animations/font-variations/font-variation-settings-expected.html: Renamed from LayoutTests/animations/font-variation-settings-expected.html.
* animations/font-variations/font-variation-settings-order-expected.html: Renamed from LayoutTests/animations/font-variation-settings-order-expected.html.
* animations/font-variations/font-variation-settings-order.html: Renamed from LayoutTests/animations/font-variation-settings-order.html.
* animations/font-variations/font-variation-settings-unlike-expected.html: Renamed from LayoutTests/animations/font-variation-settings-unlike-expected.html.
* animations/font-variations/font-variation-settings-unlike.html: Renamed from LayoutTests/animations/font-variation-settings-unlike.html.
* animations/font-variations/font-variation-settings.html: Renamed from LayoutTests/animations/font-variation-settings.html.
* platform/gtk/TestExpectations:
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsanimationsresourcesanimationtesthelpersjs">trunk/LayoutTests/animations/resources/animation-test-helpers.js</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>trunk/LayoutTests/animations/font-variations/</li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsfontvariationsettingsexpectedhtml">trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderexpectedhtml">trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderhtml">trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikeexpectedhtml">trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikehtml">trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html</a></li>
<li><a href="#trunkLayoutTestsanimationsfontvariationsfontvariationsettingshtml">trunk/LayoutTests/animations/font-variations/font-variation-settings.html</a></li>
</ul>

<h3>Removed 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>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/ChangeLog        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
+        https://bugs.webkit.org/show_bug.cgi?id=163374
+
+        Reviewed by Darin Adler.
+
+        Moving animations/font-variation-settings* tests to animations/font-variations
+        in order to make them easier to mark as failing.
+
+        Mark the relevant tests as failing on El Capitan and iOS 9.
+
+        * animations/font-variations/font-variation-settings-expected.html: Renamed from LayoutTests/animations/font-variation-settings-expected.html.
+        * animations/font-variations/font-variation-settings-order-expected.html: Renamed from LayoutTests/animations/font-variation-settings-order-expected.html.
+        * animations/font-variations/font-variation-settings-order.html: Renamed from LayoutTests/animations/font-variation-settings-order.html.
+        * animations/font-variations/font-variation-settings-unlike-expected.html: Renamed from LayoutTests/animations/font-variation-settings-unlike-expected.html.
+        * animations/font-variations/font-variation-settings-unlike.html: Renamed from LayoutTests/animations/font-variation-settings-unlike.html.
+        * animations/font-variations/font-variation-settings.html: Renamed from LayoutTests/animations/font-variation-settings.html.
+        * platform/gtk/TestExpectations:
+        * platform/ios-simulator/TestExpectations:
+        * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-10-20  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         IndexedDB 2.0: Support IDBObjectStore name assignment.
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/animations/font-variation-settings-expected.html (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-expected.html        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/font-variation-settings-expected.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div style=&quot;font: 100px 'Skia'; font-variation-settings: 'wght' 2.3&quot;&gt;Hello&lt;/div&gt;
-&lt;div&gt;PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 0.5s saw something close to: 'wght' 0.95&lt;br&gt;
-PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: 'wght' 1.4&lt;br&gt;
-PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: 'wght' 2.3&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsorderexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/animations/font-variation-settings-order-expected.html (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-order-expected.html        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/font-variation-settings-order-expected.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div style=&quot;font: 100px 'Skia'; font-variation-settings: 'wght' 2.3, 'wdth' 1.1&quot;&gt;Hello&lt;/div&gt;
-&lt;div&gt;PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 0.5s saw something close to: 'wght' 0.95, 'wdth' 0.95&lt;br&gt;
-PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: 'wght' 1.4, 'wdth' 1&lt;br&gt;
-PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: 'wght' 2.3, 'wdth' 1.1&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsorderhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/animations/font-variation-settings-order.html (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-order.html        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/font-variation-settings-order.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;script src=&quot;resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
-&lt;style&gt;
-@keyframes &quot;weightAnimation&quot; {
-    from {
-        font-variation-settings: &quot;wght&quot; 0.5, &quot;wdth&quot; 0.9;
-    }
-    to {
-        font-variation-settings: &quot;wdth&quot; 1.2, &quot;wght&quot; 3.2;
-    }
-}
-
-#box {
-    font: 100px &quot;Skia&quot;;
-    animation-name: &quot;weightAnimation&quot;;
-    animation-duration: 3s;
-    animation-timing-function: linear;
-}
-&lt;/style&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div id=&quot;box&quot;&gt;Hello&lt;/div&gt;
-&lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
-&lt;script&gt;
-var expectedValues = [
-    // [animation-name, time, element-id, property, expected-value, tolerance]
-    [&quot;weightAnimation&quot;, 0.5, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 0.95, 'wdth' 0.95&quot;, 0.05],
-    [&quot;weightAnimation&quot;, 1.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 1.4, 'wdth' 1&quot;, 0.05],
-    [&quot;weightAnimation&quot;, 2.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 2.3, 'wdth' 1.1&quot;, 0.05],
-];
-runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
-&lt;/script&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsunlikeexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div style=&quot;font: 100px 'Skia';&quot;&gt;Hello&lt;/div&gt;
-&lt;div&gt;PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 0.5s saw something close to: normal&lt;br&gt;
-PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: normal&lt;br&gt;
-PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: normal&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingsunlikehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/animations/font-variation-settings-unlike.html (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings-unlike.html        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/font-variation-settings-unlike.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;script src=&quot;resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
-&lt;style&gt;
-@keyframes &quot;weightAnimation&quot; {
-    from {
-        font-variation-settings: &quot;wght&quot; 0.5, &quot;wdth&quot; 0.9;
-    }
-    to {
-        font-variation-settings: &quot;wght&quot; 3.2;
-    }
-}
-
-#box {
-    font: 100px &quot;Skia&quot;;
-    animation-name: &quot;weightAnimation&quot;;
-    animation-duration: 3s;
-    animation-timing-function: linear;
-}
-&lt;/style&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div id=&quot;box&quot;&gt;Hello&lt;/div&gt;
-&lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
-&lt;script&gt;
-var expectedValues = [
-    // [animation-name, time, element-id, property, expected-value, tolerance]
-    [&quot;weightAnimation&quot;, 0.5, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;normal&quot;, 0.05],
-    [&quot;weightAnimation&quot;, 1.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;normal&quot;, 0.05],
-    [&quot;weightAnimation&quot;, 2.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;normal&quot;, 0.05],
-];
-runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
-&lt;/script&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsettingshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/animations/font-variation-settings.html (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variation-settings.html        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/font-variation-settings.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
-&lt;script src=&quot;resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
-&lt;style&gt;
-@keyframes &quot;weightAnimation&quot; {
-    from {
-        font-variation-settings: &quot;wght&quot; 0.5;
-    }
-    to {
-        font-variation-settings: &quot;wght&quot; 3.2;
-    }
-}
-
-#box {
-    font: 100px &quot;Skia&quot;;
-    animation-name: &quot;weightAnimation&quot;;
-    animation-duration: 3s;
-    animation-timing-function: linear;
-}
-&lt;/style&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div id=&quot;box&quot;&gt;Hello&lt;/div&gt;
-&lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
-&lt;script&gt;
-var expectedValues = [
-    // [animation-name, time, element-id, property, expected-value, tolerance]
-    [&quot;weightAnimation&quot;, 0.5, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 0.95&quot;, 0.05],
-    [&quot;weightAnimation&quot;, 1.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 1.4&quot;, 0.05],
-    [&quot;weightAnimation&quot;, 2.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 2.3&quot;, 0.05],
-];
-runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
-&lt;/script&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsexpectedhtmlfromrev207641trunkLayoutTestsanimationsfontvariationsettingsexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html (from rev 207641, trunk/LayoutTests/animations/font-variation-settings-expected.html) (0 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html                                (rev 0)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.internals)
+   window.internals.settings.setVariationFontsEnabled(true);
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;font: 100px '-apple-system'; font-variation-settings: 'wght' 1.3&quot;&gt;Hello&lt;/div&gt;
+&lt;div&gt;PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 0.5s saw something close to: 'wght' 0.4&lt;br&gt;
+PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: 'wght' 0.7&lt;br&gt;
+PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: 'wght' 1.3&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderexpectedhtmlfromrev207641trunkLayoutTestsanimationsfontvariationsettingsorderexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html (from rev 207641, trunk/LayoutTests/animations/font-variation-settings-order-expected.html) (0 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html                                (rev 0)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.internals)
+   window.internals.settings.setVariationFontsEnabled(true);
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;font: 100px 'Skia'; font-variation-settings: 'wght' 2.3, 'wdth' 1.1&quot;&gt;Hello&lt;/div&gt;
+&lt;div&gt;PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 0.5s saw something close to: 'wght' 0.95, 'wdth' 0.95&lt;br&gt;
+PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: 'wght' 1.4, 'wdth' 1&lt;br&gt;
+PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: 'wght' 2.3, 'wdth' 1.1&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderhtmlfromrev207641trunkLayoutTestsanimationsfontvariationsettingsorderhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html (from rev 207641, trunk/LayoutTests/animations/font-variation-settings-order.html) (0 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html                                (rev 0)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.internals)
+    window.internals.settings.setVariationFontsEnabled(true);
+&lt;/script&gt;
+&lt;script src=&quot;../resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
+&lt;style&gt;
+@keyframes &quot;weightAnimation&quot; {
+    from {
+        font-variation-settings: &quot;wght&quot; 0.5, &quot;wdth&quot; 0.9;
+    }
+    to {
+        font-variation-settings: &quot;wdth&quot; 1.2, &quot;wght&quot; 3.2;
+    }
+}
+
+#box {
+    font: 100px &quot;Skia&quot;;
+    animation-name: &quot;weightAnimation&quot;;
+    animation-duration: 3s;
+    animation-timing-function: linear;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div id=&quot;box&quot;&gt;Hello&lt;/div&gt;
+&lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
+&lt;script&gt;
+var expectedValues = [
+    // [animation-name, time, element-id, property, expected-value, tolerance]
+    [&quot;weightAnimation&quot;, 0.5, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 0.95, 'wdth' 0.95&quot;, 0.05],
+    [&quot;weightAnimation&quot;, 1.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 1.4, 'wdth' 1&quot;, 0.05],
+    [&quot;weightAnimation&quot;, 2.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 2.3, 'wdth' 1.1&quot;, 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikeexpectedhtmlfromrev207641trunkLayoutTestsanimationsfontvariationsettingsunlikeexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html (from rev 207641, trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html) (0 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html                                (rev 0)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.internals)
+   window.internals.settings.setVariationFontsEnabled(true);
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;font: 100px 'Skia';&quot;&gt;Hello&lt;/div&gt;
+&lt;div&gt;PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 0.5s saw something close to: normal&lt;br&gt;
+PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: normal&lt;br&gt;
+PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: normal&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikehtmlfromrev207641trunkLayoutTestsanimationsfontvariationsettingsunlikehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html (from rev 207641, trunk/LayoutTests/animations/font-variation-settings-unlike.html) (0 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html                                (rev 0)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.internals)
+    window.internals.settings.setVariationFontsEnabled(true);
+&lt;/script&gt;
+&lt;script src=&quot;../resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
+&lt;style&gt;
+@keyframes &quot;weightAnimation&quot; {
+    from {
+        font-variation-settings: &quot;wght&quot; 0.5, &quot;wdth&quot; 0.9;
+    }
+    to {
+        font-variation-settings: &quot;wght&quot; 3.2;
+    }
+}
+
+#box {
+    font: 100px &quot;Skia&quot;;
+    animation-name: &quot;weightAnimation&quot;;
+    animation-duration: 3s;
+    animation-timing-function: linear;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div id=&quot;box&quot;&gt;Hello&lt;/div&gt;
+&lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
+&lt;script&gt;
+var expectedValues = [
+    // [animation-name, time, element-id, property, expected-value, tolerance]
+    [&quot;weightAnimation&quot;, 0.5, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;normal&quot;, 0.05],
+    [&quot;weightAnimation&quot;, 1.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;normal&quot;, 0.05],
+    [&quot;weightAnimation&quot;, 2.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;normal&quot;, 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingshtmlfromrev207641trunkLayoutTestsanimationsfontvariationsettingshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/animations/font-variations/font-variation-settings.html (from rev 207641, trunk/LayoutTests/animations/font-variation-settings.html) (0 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings.html                                (rev 0)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings.html        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.internals)
+    window.internals.settings.setVariationFontsEnabled(true);
+&lt;/script&gt;
+&lt;script src=&quot;../resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
+&lt;style&gt;
+@keyframes &quot;weightAnimation&quot; {
+    from {
+        font-variation-settings: &quot;wght&quot; 0.1;
+    }
+    to {
+        font-variation-settings: &quot;wght&quot; 1.9;
+    }
+}
+
+#box {
+    font: 100px &quot;-apple-system&quot;;
+    animation-name: &quot;weightAnimation&quot;;
+    animation-duration: 3s;
+    animation-timing-function: linear;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div id=&quot;box&quot;&gt;Hello&lt;/div&gt;
+&lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
+&lt;script&gt;
+var expectedValues = [
+    // [animation-name, time, element-id, property, expected-value, tolerance]
+    [&quot;weightAnimation&quot;, 0.5, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 0.4&quot;, 0.05],
+    [&quot;weightAnimation&quot;, 1.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 0.7&quot;, 0.05],
+    [&quot;weightAnimation&quot;, 2.0, &quot;box&quot;, &quot;font-variation-settings&quot;, &quot;'wght' 1.3&quot;, 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsresourcesanimationtesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/resources/animation-test-helpers.js (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/resources/animation-test-helpers.js        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/animations/resources/animation-test-helpers.js        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -260,6 +260,8 @@
</span><span class="cx"> 
</span><span class="cx"> function compareFontVariationSettings(computedValue, expectedValue, tolerance)
</span><span class="cx"> {
</span><ins>+    if (!computedValue)
+        return false;
</ins><span class="cx">     if (computedValue == &quot;normal&quot; || expectedValue == &quot;normal&quot;)
</span><span class="cx">         return computedValue == expectedValue;
</span><span class="cx">     var computed = computedValue.split(&quot;, &quot;);
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/platform/gtk/TestExpectations        2016-10-20 23:05:53 UTC (rev 207642)
</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-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 ]
</del><ins>+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 ]
</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 (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -2713,3 +2713,10 @@
</span><span class="cx"> webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/163755 imported/w3c/csswg-test/css-shapes-1 [ Skip ]
</span><ins>+
+# 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 ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/LayoutTests/platform/mac/TestExpectations        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1465,7 +1465,10 @@
</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-variation-settings-order.html [ Crash ]
</del><ins>+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 ]
</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 (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-10-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
+        https://bugs.webkit.org/show_bug.cgi?id=163374
+
+        Reviewed by Darin Adler.
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-20  Caitlin Potter  &lt;caitp@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [JSC] disallow references to `await` in AsyncFunction formal parameters
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -31,6 +31,10 @@
</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><ins>+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;
+
</ins><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">@@ -40,10 +44,13 @@
</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><del>-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;
</del><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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">@@ -199,6 +206,16 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx"> 
</span><del>-ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</del><ins>+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*] = ;
</ins><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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 (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/WebCore/ChangeLog        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
+        https://bugs.webkit.org/show_bug.cgi?id=163374
+
+        Reviewed by Darin Adler.
+
+        Because of platform lack of support for variations in in-memory fonts,
+        this feature should be disabled on the affected OSes.
+
+        No tests because there is no behavior change (on the relevant platforms).
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-20  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         IndexedDB 2.0: Support IDBObjectStore name assignment.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -31,6 +31,10 @@
</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><ins>+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;
+
</ins><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">@@ -40,10 +44,13 @@
</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><del>-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;
</del><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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">@@ -199,6 +206,16 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx"> 
</span><del>-ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</del><ins>+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*] = ;
</ins><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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 (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/WebKit/mac/ChangeLog        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-10-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
+        https://bugs.webkit.org/show_bug.cgi?id=163374
+
+        Reviewed by Darin Adler.
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-19  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Revert r207151
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -31,6 +31,10 @@
</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><ins>+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;
+
</ins><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">@@ -40,10 +44,13 @@
</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><del>-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;
</del><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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">@@ -199,6 +206,16 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx"> 
</span><del>-ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</del><ins>+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*] = ;
</ins><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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 (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/WebKit2/ChangeLog        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-10-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
+        https://bugs.webkit.org/show_bug.cgi?id=163374
+
+        Reviewed by Darin Adler.
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-20  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         IndexedDB 2.0: Support IDBObjectStore name assignment.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -31,6 +31,10 @@
</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><ins>+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;
+
</ins><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">@@ -40,10 +44,13 @@
</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><del>-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;
</del><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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">@@ -199,6 +206,16 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx"> 
</span><del>-ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</del><ins>+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*] = ;
</ins><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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 (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Tools/ChangeLog        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-10-19  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
+        https://bugs.webkit.org/show_bug.cgi?id=163374
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-20  Sam Weinig  &lt;sam@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Add convenience function that combines WTF::visit(...) with WTF::makeVisitor(...)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (207641 => 207642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig        2016-10-20 23:03:21 UTC (rev 207641)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig        2016-10-20 23:05:53 UTC (rev 207642)
</span><span class="lines">@@ -31,6 +31,10 @@
</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><ins>+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;
+
</ins><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">@@ -40,10 +44,13 @@
</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><del>-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;
</del><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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">@@ -199,6 +206,16 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx"> 
</span><del>-ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</del><ins>+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*] = ;
</ins><span class="cx"> 
</span><ins>+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 = ;
+
</ins><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>