<!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>[210315] 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/210315">210315</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-01-04 20:35:48 -0800 (Wed, 04 Jan 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove runtime flag for variation fonts
https://bugs.webkit.org/show_bug.cgi?id=164251

Reviewed by Dean Jackson.

Source/WebCore:

No new tests because there is no behavior change, but updated the following
tests to stop setting the flag:
- animations/font-variations/font-variation-settings-order.html:
- animations/font-variations/font-variation-settings-unlike.html:
- animations/font-variations/font-variation-settings.html:
- fast/text/variations/duplicate.html:
- fast/text/variations/exist.html:
- fast/text/variations/getComputedStyle.html:
- fast/text/variations/inheritance.html:
- fast/text/variations/order.html:
- fast/text/variations/outofbounds.html:

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/parser/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):
* css/parser/CSSParserMode.h:
(WebCore::CSSParserContext::completeURL):
(WebCore::CSSParserContextHash::hash):
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseSingleValue):
* page/Settings.in:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::variationFontsEnabled): Deleted.
(WebCore::InternalSettings::setVariationFontsEnabled): Deleted.
* testing/InternalSettings.h:
* testing/InternalSettings.idl:

Source/WebKit2:

* Shared/WebPreferencesDefinitions.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::registerUserDefaultsIfNeeded):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):

LayoutTests:

* animations/font-variations/font-variation-settings-expected.html:
* animations/font-variations/font-variation-settings-order-expected.html:
* animations/font-variations/font-variation-settings-order.html:
* animations/font-variations/font-variation-settings-unlike-expected.html:
* animations/font-variations/font-variation-settings-unlike.html:
* animations/font-variations/font-variation-settings.html:
* fast/text/variations/duplicate-expected.html:
* fast/text/variations/duplicate.html:
* fast/text/variations/exist-expected-mismatch.html:
* fast/text/variations/exist.html:
* fast/text/variations/getComputedStyle.html:
* fast/text/variations/inheritance-expected.html:
* fast/text/variations/inheritance.html:
* fast/text/variations/order-expected.html:
* fast/text/variations/order.html:
* fast/text/variations/outofbounds-expected.html:
* fast/text/variations/outofbounds.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></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>
<li><a href="#trunkLayoutTestsfasttextvariationsduplicateexpectedhtml">trunk/LayoutTests/fast/text/variations/duplicate-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsduplicatehtml">trunk/LayoutTests/fast/text/variations/duplicate.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsexistexpectedmismatchhtml">trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsexisthtml">trunk/LayoutTests/fast/text/variations/exist.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsgetComputedStylehtml">trunk/LayoutTests/fast/text/variations/getComputedStyle.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsinheritanceexpectedhtml">trunk/LayoutTests/fast/text/variations/inheritance-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsinheritancehtml">trunk/LayoutTests/fast/text/variations/inheritance.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsorderexpectedhtml">trunk/LayoutTests/fast/text/variations/order-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsorderhtml">trunk/LayoutTests/fast/text/variations/order.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsoutofboundshtml">trunk/LayoutTests/fast/text/variations/outofbounds.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserModeh">trunk/Source/WebCore/css/parser/CSSParserMode.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsidl">trunk/Source/WebCore/testing/InternalSettings.idl</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/ChangeLog        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-04  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Remove runtime flag for variation fonts
+        https://bugs.webkit.org/show_bug.cgi?id=164251
+
+        Reviewed by Dean Jackson.
+
+        * animations/font-variations/font-variation-settings-expected.html:
+        * animations/font-variations/font-variation-settings-order-expected.html:
+        * animations/font-variations/font-variation-settings-order.html:
+        * animations/font-variations/font-variation-settings-unlike-expected.html:
+        * animations/font-variations/font-variation-settings-unlike.html:
+        * animations/font-variations/font-variation-settings.html:
+        * fast/text/variations/duplicate-expected.html:
+        * fast/text/variations/duplicate.html:
+        * fast/text/variations/exist-expected-mismatch.html:
+        * fast/text/variations/exist.html:
+        * fast/text/variations/getComputedStyle.html:
+        * fast/text/variations/inheritance-expected.html:
+        * fast/text/variations/inheritance.html:
+        * fast/text/variations/order-expected.html:
+        * fast/text/variations/order.html:
+        * fast/text/variations/outofbounds-expected.html:
+        * fast/text/variations/outofbounds.html:
+
</ins><span class="cx"> 2017-01-04  Nan Wang  &lt;n_wang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Many new HTML5 input types still exposed as generic AXTextfield
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font: 100px '-apple-system'; font-variation-settings: 'wght' 1.3&quot;&gt;Hello&lt;/div&gt;
</span><span class="lines">@@ -12,4 +8,4 @@
</span><span class="cx"> PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 1s saw something close to: 'wght' 0.7&lt;br&gt;
</span><span class="cx"> PASS - &quot;font-variation-settings&quot; property for &quot;box&quot; element at 2s saw something close to: 'wght' 1.3&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font: 100px 'Skia'; font-variation-settings: 'wght' 2.3, 'wdth' 1.1&quot;&gt;Hello&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsorderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;script src=&quot;../resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
</span><span class="cx"> &lt;style&gt;
</span><span class="cx"> @keyframes weightAnimation {
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikeexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font: 100px 'Skia';&quot;&gt;Hello&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingsunlikehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;script src=&quot;../resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
</span><span class="cx"> &lt;style&gt;
</span><span class="cx"> @keyframes weightAnimation {
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfontvariationsfontvariationsettingshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/font-variations/font-variation-settings.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/animations/font-variations/font-variation-settings.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;script src=&quot;../resources/animation-test-helpers.js&quot;&gt;&lt;/script&gt;
</span><span class="cx"> &lt;style&gt;
</span><span class="cx"> @keyframes weightAnimation {
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsduplicateexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/duplicate-expected.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/duplicate-expected.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/duplicate-expected.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wght' 3;&quot;&gt;Test passes if this text has a weight of 3.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsduplicatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/duplicate.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/duplicate.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/duplicate.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wght' 3;&quot;&gt;Test passes if this text has a weight of 3.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsexistexpectedmismatchhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia';&quot;&gt;Test passes if this text is bold.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsexisthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/exist.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/exist.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/exist.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,10 +1,6 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: '-apple-system'; font-variation-settings: 'wght' 1.8;&quot;&gt;Test passes if this text is bold.&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsgetComputedStylehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/getComputedStyle.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/getComputedStyle.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/getComputedStyle.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -2,10 +2,6 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><span class="cx"> &lt;meta charset=&quot;utf-8&quot;&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;script src=&quot;../../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="lines">@@ -29,4 +25,4 @@
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;script src=&quot;../../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsinheritanceexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/inheritance-expected.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/inheritance-expected.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/inheritance-expected.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wght' 2;&quot;&gt;Test passes if this text is bold.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsinheritancehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/inheritance.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/inheritance.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/inheritance.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wght' 2;&quot;&gt;&lt;div&gt;Test passes if this text is bold.&lt;/div&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsorderexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/order-expected.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/order-expected.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/order-expected.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wdth' 1.2, 'wght' 2;&quot;&gt;Test passes if this text has a weight of 3.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsorderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/order.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/order.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/order.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wdth' 1.2;&quot;&gt;Test passes if this text has a weight of 3.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsoutofboundshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/outofbounds.html (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/outofbounds.html        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/fast/text/variations/outofbounds.html        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><del>-&lt;script&gt;
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-&lt;/script&gt;
</del><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;font-family: 'Skia'; font-variation-settings: 'wght' 27;&quot;&gt;Test passes if this text is bold.&lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/ChangeLog        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2017-01-04  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Remove runtime flag for variation fonts
+        https://bugs.webkit.org/show_bug.cgi?id=164251
+
+        Reviewed by Dean Jackson.
+
+        No new tests because there is no behavior change, but updated the following
+        tests to stop setting the flag:
+        - animations/font-variations/font-variation-settings-order.html:
+        - animations/font-variations/font-variation-settings-unlike.html:
+        - animations/font-variations/font-variation-settings.html:
+        - fast/text/variations/duplicate.html:
+        - fast/text/variations/exist.html:
+        - fast/text/variations/getComputedStyle.html:
+        - fast/text/variations/inheritance.html:
+        - fast/text/variations/order.html:
+        - fast/text/variations/outofbounds.html:
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/parser/CSSParser.cpp:
+        (WebCore::CSSParserContext::CSSParserContext):
+        (WebCore::operator==):
+        * css/parser/CSSParserMode.h:
+        (WebCore::CSSParserContext::completeURL):
+        (WebCore::CSSParserContextHash::hash):
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::CSSPropertyParser::parseSingleValue):
+        * page/Settings.in:
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::InternalSettings::variationFontsEnabled): Deleted.
+        (WebCore::InternalSettings::setVariationFontsEnabled): Deleted.
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+
</ins><span class="cx"> 2017-01-04  Andy Estes  &lt;aestes@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Teach SharedBuffer to return an NSArray of data segments to avoid flattening
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -2911,16 +2911,13 @@
</span><span class="cx">         }
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx">         case CSSPropertyFontVariationSettings: {
</span><del>-            if (styledElement-&gt;document().settings() &amp;&amp; styledElement-&gt;document().settings()-&gt;variationFontsEnabled()) {
-                const FontVariationSettings&amp; variationSettings = style-&gt;fontDescription().variationSettings();
-                if (variationSettings.isEmpty())
-                    return cssValuePool.createIdentifierValue(CSSValueNormal);
-                RefPtr&lt;CSSValueList&gt; list = CSSValueList::createCommaSeparated();
-                for (auto&amp; feature : variationSettings)
-                    list-&gt;append(CSSFontVariationValue::create(feature.tag(), feature.value()));
-                return list;
-            }
-            break;
</del><ins>+            const FontVariationSettings&amp; variationSettings = style-&gt;fontDescription().variationSettings();
+            if (variationSettings.isEmpty())
+                return cssValuePool.createIdentifierValue(CSSValueNormal);
+            RefPtr&lt;CSSValueList&gt; list = CSSValueList::createCommaSeparated();
+            for (auto&amp; feature : variationSettings)
+                list-&gt;append(CSSFontVariationValue::create(feature.tag(), feature.value()));
+            return list;
</ins><span class="cx">         }
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -92,10 +92,6 @@
</span><span class="cx">         textAutosizingEnabled = settings-&gt;textAutosizingEnabled();
</span><span class="cx"> #endif
</span><span class="cx">         springTimingFunctionEnabled = settings-&gt;springTimingFunctionEnabled();
</span><del>-
-#if ENABLE(VARIATION_FONTS)
-        variationFontsEnabled = settings-&gt;variationFontsEnabled();
-#endif
</del><span class="cx">         deferredCSSParserEnabled = settings-&gt;deferredCSSParserEnabled();
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -119,9 +115,6 @@
</span><span class="cx">         &amp;&amp; a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
</span><span class="cx">         &amp;&amp; a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
</span><span class="cx">         &amp;&amp; a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior
</span><del>-#if ENABLE(VARIATION_FONTS)
-        &amp;&amp; a.variationFontsEnabled == b.variationFontsEnabled
-#endif
</del><span class="cx">         &amp;&amp; a.springTimingFunctionEnabled == b.springTimingFunctionEnabled
</span><span class="cx">         &amp;&amp; a.deferredCSSParserEnabled == b.deferredCSSParserEnabled;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserMode.h (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserMode.h        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/css/parser/CSSParserMode.h        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -117,10 +117,6 @@
</span><span class="cx">             return URL(baseURL, url);
</span><span class="cx">         return URL(baseURL, url, TextEncoding(charset));
</span><span class="cx">     }
</span><del>-
-#if ENABLE(VARIATION_FONTS)
-    bool variationFontsEnabled { false };
-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> bool operator==(const CSSParserContext&amp;, const CSSParserContext&amp;);
</span><span class="lines">@@ -146,11 +142,8 @@
</span><span class="cx">             &amp; key.enforcesCSSMIMETypeInNoQuirksMode         &lt;&lt; 5
</span><span class="cx">             &amp; key.useLegacyBackgroundSizeShorthandBehavior  &lt;&lt; 6
</span><span class="cx">             &amp; key.springTimingFunctionEnabled               &lt;&lt; 7
</span><del>-#if ENABLE(VARIATION_FONTS)
-            &amp; key.variationFontsEnabled                     &lt;&lt; 8
-#endif
-            &amp; key.deferredCSSParserEnabled                  &lt;&lt; 9
-            &amp; key.mode                                      &lt;&lt; 10;
</del><ins>+            &amp; key.deferredCSSParserEnabled                  &lt;&lt; 8
+            &amp; key.mode                                      &lt;&lt; 9;
</ins><span class="cx">         hash ^= WTF::intHash(bits);
</span><span class="cx">         return hash;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -3656,9 +3656,7 @@
</span><span class="cx">         return consumeFontSynthesis(m_range);
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx">     case CSSPropertyFontVariationSettings:
</span><del>-        if (m_context.variationFontsEnabled)
-            return consumeFontVariationSettings(m_range);
-        return nullptr;
</del><ins>+        return consumeFontVariationSettings(m_range);
</ins><span class="cx"> #endif
</span><span class="cx">     case CSSPropertyLetterSpacing:
</span><span class="cx">         return consumeLetterSpacing(m_range, m_context.mode);
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/page/Settings.in        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -275,8 +275,6 @@
</span><span class="cx"> 
</span><span class="cx"> treatIPAddressAsDomain initial=false
</span><span class="cx"> 
</span><del>-variationFontsEnabled initial=true, setNeedsStyleRecalcInAllFrames=1, conditional=VARIATION_FONTS
-
</del><span class="cx"> # Runtime-enabled features
</span><span class="cx"> visualViewportEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -90,9 +90,6 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx">     , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
</span><span class="cx"> #endif
</span><del>-#if ENABLE(VARIATION_FONTS)
-    , m_variationFontsEnabled(settings.variationFontsEnabled())
-#endif
</del><span class="cx">     , m_deferredCSSParserEnabled(settings.deferredCSSParserEnabled())
</span><span class="cx">     , m_inputEventsEnabled(settings.inputEventsEnabled())
</span><span class="cx">     , m_userInterfaceDirectionPolicy(settings.userInterfaceDirectionPolicy())
</span><span class="lines">@@ -173,9 +170,6 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(VARIATION_FONTS)
-    settings.setVariationFontsEnabled(m_variationFontsEnabled);
-#endif
</del><span class="cx">     settings.setDeferredCSSParserEnabled(m_deferredCSSParserEnabled);
</span><span class="cx">     settings.setInputEventsEnabled(m_inputEventsEnabled);
</span><span class="cx">     settings.setUserInterfaceDirectionPolicy(m_userInterfaceDirectionPolicy);
</span><span class="lines">@@ -734,29 +728,6 @@
</span><span class="cx">     Settings::setAllowsAnySSLCertificate(allowsAnyCertificate);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ExceptionOr&lt;bool&gt; InternalSettings::variationFontsEnabled()
-{
-    if (!m_page)
-        return Exception { INVALID_ACCESS_ERR };
-#if ENABLE(VARIATION_FONTS)
-    return settings().variationFontsEnabled();
-#else
-    return false;
-#endif
-}
-
-ExceptionOr&lt;void&gt; InternalSettings::setVariationFontsEnabled(bool enabled)
-{
-    if (!m_page)
-        return Exception { INVALID_ACCESS_ERR };
-#if ENABLE(VARIATION_FONTS)
-    settings().setVariationFontsEnabled(enabled);
-#else
-    UNUSED_PARAM(enabled);
-#endif
-    return { };
-}
-
</del><span class="cx"> ExceptionOr&lt;bool&gt; InternalSettings::deferredCSSParserEnabled()
</span><span class="cx"> {
</span><span class="cx">     if (!m_page)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/testing/InternalSettings.h        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -96,8 +96,6 @@
</span><span class="cx">     ExceptionOr&lt;void&gt; setUserInterfaceDirectionPolicy(const String&amp;);
</span><span class="cx">     ExceptionOr&lt;String&gt; systemLayoutDirection();
</span><span class="cx">     ExceptionOr&lt;void&gt; setSystemLayoutDirection(const String&amp;);
</span><del>-    ExceptionOr&lt;bool&gt; variationFontsEnabled();
-    ExceptionOr&lt;void&gt; setVariationFontsEnabled(bool);
</del><span class="cx">     
</span><span class="cx">     ExceptionOr&lt;bool&gt; deferredCSSParserEnabled();
</span><span class="cx">     ExceptionOr&lt;void&gt; setDeferredCSSParserEnabled(bool);
</span><span class="lines">@@ -177,9 +175,6 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx">         bool m_indexedDBWorkersEnabled;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(VARIATION_FONTS)
-        bool m_variationFontsEnabled;
-#endif
</del><span class="cx">         bool m_deferredCSSParserEnabled;
</span><span class="cx">         bool m_inputEventsEnabled;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.idl (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.idl        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebCore/testing/InternalSettings.idl        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -89,9 +89,6 @@
</span><span class="cx">     [MayThrowException] DOMString systemLayoutDirection();
</span><span class="cx">     [MayThrowException] void setSystemLayoutDirection(DOMString direction);
</span><span class="cx"> 
</span><del>-    [MayThrowException] boolean variationFontsEnabled();
-    [MayThrowException] void setVariationFontsEnabled(boolean enabled);
-
</del><span class="cx">     [MayThrowException] boolean deferredCSSParserEnabled();
</span><span class="cx">     [MayThrowException] void setDeferredCSSParserEnabled(boolean enabled);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebKit2/ChangeLog        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-01-04  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Remove runtime flag for variation fonts
+        https://bugs.webkit.org/show_bug.cgi?id=164251
+
+        Reviewed by Dean Jackson.
+
+        * Shared/WebPreferencesDefinitions.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::registerUserDefaultsIfNeeded):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2017-01-04  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r210287.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -317,7 +317,6 @@
</span><span class="cx">     macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, &quot;CSS Spring Animations&quot;, &quot;CSS Spring Animation prototype&quot;) \
</span><span class="cx">     macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, &quot;Gamepads&quot;, &quot;Web Gamepad API support&quot;) \
</span><span class="cx">     macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, false, &quot;Modern Media Controls&quot;, &quot;Use modern media controls look&quot;) \
</span><del>-    macro(VariationFontsEnabled, variationFontsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, &quot;Variation Fonts&quot;, &quot;Enable variation fonts&quot;) \
</del><span class="cx">     macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, &quot;Input Events&quot;, &quot;Enable InputEvents support&quot;) \
</span><span class="cx">     macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, &quot;SubtleCrypto&quot;, &quot;Enable SubtleCrypto support&quot;) \
</span><span class="cx">     macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, &quot;WebGL 2.0&quot;, &quot;WebGL 2 prototype&quot;) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx"> static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @&quot;WebKitSuppressMemoryPressureHandler&quot;;
</span><span class="cx"> static NSString * const WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey = @&quot;WebKitNetworkLoadThrottleLatencyMilliseconds&quot;;
</span><span class="cx"> 
</span><del>-static NSString * const WebKitVariationFontsEnabledDefaultsKey = @&quot;ExperimentalVariationFontsEnabled&quot;;
-
</del><span class="cx"> #if ENABLE(NETWORK_CAPTURE)
</span><span class="cx"> static NSString * const WebKitRecordReplayModeDefaultsKey = @&quot;WebKitRecordReplayMode&quot;;
</span><span class="cx"> static NSString * const WebKitRecordReplayCacheLocationDefaultsKey = @&quot;WebKitRecordReplayCacheLocation&quot;;
</span><span class="lines">@@ -114,8 +112,6 @@
</span><span class="cx">     [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitVariationFontsEnabledDefaultsKey];
-
</del><span class="cx">     [[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (210314 => 210315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2017-01-05 04:35:48 UTC (rev 210315)
</span><span class="lines">@@ -3207,10 +3207,6 @@
</span><span class="cx"> 
</span><span class="cx">     settings.setVisualViewportEnabled(store.getBoolValueForKey(WebPreferencesKey::visualViewportEnabledKey()));
</span><span class="cx"> 
</span><del>-#if ENABLE(VARIATION_FONTS)
-    settings.setVariationFontsEnabled(store.getBoolValueForKey(WebPreferencesKey::variationFontsEnabledKey()));
-#endif
-
</del><span class="cx">     settings.setInputEventsEnabled(store.getBoolValueForKey(WebPreferencesKey::inputEventsEnabledKey()));
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setInputEventsEnabled(store.getBoolValueForKey(WebPreferencesKey::inputEventsEnabledKey()));
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>