Remove runtime flag for variation fonts
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Jan 2017 04:35:48 +0000 (04:35 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Jan 2017 04:35:48 +0000 (04:35 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@210315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

30 files changed:
LayoutTests/ChangeLog
LayoutTests/animations/font-variations/font-variation-settings-expected.html
LayoutTests/animations/font-variations/font-variation-settings-order-expected.html
LayoutTests/animations/font-variations/font-variation-settings-order.html
LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html
LayoutTests/animations/font-variations/font-variation-settings-unlike.html
LayoutTests/animations/font-variations/font-variation-settings.html
LayoutTests/fast/text/variations/duplicate-expected.html
LayoutTests/fast/text/variations/duplicate.html
LayoutTests/fast/text/variations/exist-expected-mismatch.html
LayoutTests/fast/text/variations/exist.html
LayoutTests/fast/text/variations/getComputedStyle.html
LayoutTests/fast/text/variations/inheritance-expected.html
LayoutTests/fast/text/variations/inheritance.html
LayoutTests/fast/text/variations/order-expected.html
LayoutTests/fast/text/variations/order.html
LayoutTests/fast/text/variations/outofbounds.html
Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/parser/CSSParser.cpp
Source/WebCore/css/parser/CSSParserMode.h
Source/WebCore/css/parser/CSSPropertyParser.cpp
Source/WebCore/page/Settings.in
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesDefinitions.h
Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index f1b8af5..3e74e50 100644 (file)
@@ -1,3 +1,28 @@
+2017-01-04  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        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:
+
 2017-01-04  Nan Wang  <n_wang@apple.com>
 
         Many new HTML5 input types still exposed as generic AXTextfield
index d3badd1..4719fb8 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font: 100px '-apple-system'; font-variation-settings: 'wght' 1.3">Hello</div>
@@ -12,4 +8,4 @@ if (window.internals)
 PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 0.7<br>
 PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 1.3</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index c2993d1..cf03560 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font: 100px 'Skia'; font-variation-settings: 'wght' 2.3, 'wdth' 1.1">Hello</div>
index 7cd8f0f..f01d308 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-</script>
 <script src="../resources/animation-test-helpers.js"></script>
 <style>
 @keyframes weightAnimation {
index c29151a..7e72661 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font: 100px 'Skia';">Hello</div>
index 411ad6e..4658f5a 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-</script>
 <script src="../resources/animation-test-helpers.js"></script>
 <style>
 @keyframes weightAnimation {
index 0ddf41a..1a2a7b8 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-    window.internals.settings.setVariationFontsEnabled(true);
-</script>
 <script src="../resources/animation-test-helpers.js"></script>
 <style>
 @keyframes weightAnimation {
index 4660970..be430bb 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wght' 3;">Test passes if this text has a weight of 3.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index b2db7a3..3ed1060 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wght' 3;">Test passes if this text has a weight of 3.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 5d02f81..516c46c 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia';">Test passes if this text is bold.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 8b03ec3..91205d0 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: '-apple-system'; font-variation-settings: 'wght' 1.8;">Test passes if this text is bold.</div>
index 90a1cc7..17d3d3d 100644 (file)
@@ -2,10 +2,6 @@
 <html>
 <head>
 <meta charset="utf-8">
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 <script src="../../../resources/js-test-pre.js"></script>
 </head>
 <body>
@@ -29,4 +25,4 @@ shouldBeEqualToString("window.getComputedStyle(document.getElementById('test7'))
 </script>
 <script src="../../../resources/js-test-post.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
index e4a1e44..7c4159e 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wght' 2;">Test passes if this text is bold.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 7c6207c..d029421 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wght' 2;"><div>Test passes if this text is bold.</div></div>
 </body>
-</html>
\ No newline at end of file
+</html>
index f7fded7..0242080 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wdth' 1.2, 'wght' 2;">Test passes if this text has a weight of 3.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 93e23a0..a974814 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wdth' 1.2;">Test passes if this text has a weight of 3.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index ad926e7..f6fc5ed 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.internals)
-   window.internals.settings.setVariationFontsEnabled(true);
-</script>
 </head>
 <body>
 <div style="font-family: 'Skia'; font-variation-settings: 'wght' 27;">Test passes if this text is bold.</div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 3c27712..211837d 100644 (file)
@@ -1,3 +1,41 @@
+2017-01-04  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        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:
+
 2017-01-04  Andy Estes  <aestes@apple.com>
 
         [Cocoa] Teach SharedBuffer to return an NSArray of data segments to avoid flattening
index aa8cbb7..5144647 100644 (file)
@@ -2911,16 +2911,13 @@ RefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID,
         }
 #if ENABLE(VARIATION_FONTS)
         case CSSPropertyFontVariationSettings: {
-            if (styledElement->document().settings() && styledElement->document().settings()->variationFontsEnabled()) {
-                const FontVariationSettings& variationSettings = style->fontDescription().variationSettings();
-                if (variationSettings.isEmpty())
-                    return cssValuePool.createIdentifierValue(CSSValueNormal);
-                RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
-                for (auto& feature : variationSettings)
-                    list->append(CSSFontVariationValue::create(feature.tag(), feature.value()));
-                return list;
-            }
-            break;
+            const FontVariationSettings& variationSettings = style->fontDescription().variationSettings();
+            if (variationSettings.isEmpty())
+                return cssValuePool.createIdentifierValue(CSSValueNormal);
+            RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+            for (auto& feature : variationSettings)
+                list->append(CSSFontVariationValue::create(feature.tag(), feature.value()));
+            return list;
         }
 #endif
 #if ENABLE(CSS_GRID_LAYOUT)
index 156647d..48895cc 100644 (file)
@@ -92,10 +92,6 @@ CSSParserContext::CSSParserContext(Document& document, const URL& baseURL, const
         textAutosizingEnabled = settings->textAutosizingEnabled();
 #endif
         springTimingFunctionEnabled = settings->springTimingFunctionEnabled();
-
-#if ENABLE(VARIATION_FONTS)
-        variationFontsEnabled = settings->variationFontsEnabled();
-#endif
         deferredCSSParserEnabled = settings->deferredCSSParserEnabled();
     }
 
@@ -119,9 +115,6 @@ bool operator==(const CSSParserContext& a, const CSSParserContext& b)
         && a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
         && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
         && a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior
-#if ENABLE(VARIATION_FONTS)
-        && a.variationFontsEnabled == b.variationFontsEnabled
-#endif
         && a.springTimingFunctionEnabled == b.springTimingFunctionEnabled
         && a.deferredCSSParserEnabled == b.deferredCSSParserEnabled;
 }
index 0d504d0..8646097 100644 (file)
@@ -117,10 +117,6 @@ public:
             return URL(baseURL, url);
         return URL(baseURL, url, TextEncoding(charset));
     }
-
-#if ENABLE(VARIATION_FONTS)
-    bool variationFontsEnabled { false };
-#endif
 };
 
 bool operator==(const CSSParserContext&, const CSSParserContext&);
@@ -146,11 +142,8 @@ struct CSSParserContextHash {
             & key.enforcesCSSMIMETypeInNoQuirksMode         << 5
             & key.useLegacyBackgroundSizeShorthandBehavior  << 6
             & key.springTimingFunctionEnabled               << 7
-#if ENABLE(VARIATION_FONTS)
-            & key.variationFontsEnabled                     << 8
-#endif
-            & key.deferredCSSParserEnabled                  << 9
-            & key.mode                                      << 10;
+            & key.deferredCSSParserEnabled                  << 8
+            & key.mode                                      << 9;
         hash ^= WTF::intHash(bits);
         return hash;
     }
index 5d01562..a020951 100644 (file)
@@ -3656,9 +3656,7 @@ RefPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID property, CSS
         return consumeFontSynthesis(m_range);
 #if ENABLE(VARIATION_FONTS)
     case CSSPropertyFontVariationSettings:
-        if (m_context.variationFontsEnabled)
-            return consumeFontVariationSettings(m_range);
-        return nullptr;
+        return consumeFontVariationSettings(m_range);
 #endif
     case CSSPropertyLetterSpacing:
         return consumeLetterSpacing(m_range, m_context.mode);
index f8ea7ea..dadf3e1 100644 (file)
@@ -275,8 +275,6 @@ springTimingFunctionEnabled initial=false
 
 treatIPAddressAsDomain initial=false
 
-variationFontsEnabled initial=true, setNeedsStyleRecalcInAllFrames=1, conditional=VARIATION_FONTS
-
 # Runtime-enabled features
 visualViewportEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
 
index 7ab5efc..0a183e5 100644 (file)
@@ -90,9 +90,6 @@ InternalSettings::Backup::Backup(Settings& settings)
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
     , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
 #endif
-#if ENABLE(VARIATION_FONTS)
-    , m_variationFontsEnabled(settings.variationFontsEnabled())
-#endif
     , m_deferredCSSParserEnabled(settings.deferredCSSParserEnabled())
     , m_inputEventsEnabled(settings.inputEventsEnabled())
     , m_userInterfaceDirectionPolicy(settings.userInterfaceDirectionPolicy())
@@ -173,9 +170,6 @@ void InternalSettings::Backup::restoreTo(Settings& settings)
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
     RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
 #endif
-#if ENABLE(VARIATION_FONTS)
-    settings.setVariationFontsEnabled(m_variationFontsEnabled);
-#endif
     settings.setDeferredCSSParserEnabled(m_deferredCSSParserEnabled);
     settings.setInputEventsEnabled(m_inputEventsEnabled);
     settings.setUserInterfaceDirectionPolicy(m_userInterfaceDirectionPolicy);
@@ -734,29 +728,6 @@ void InternalSettings::setAllowsAnySSLCertificate(bool allowsAnyCertificate)
     Settings::setAllowsAnySSLCertificate(allowsAnyCertificate);
 }
 
-ExceptionOr<bool> InternalSettings::variationFontsEnabled()
-{
-    if (!m_page)
-        return Exception { INVALID_ACCESS_ERR };
-#if ENABLE(VARIATION_FONTS)
-    return settings().variationFontsEnabled();
-#else
-    return false;
-#endif
-}
-
-ExceptionOr<void> 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 { };
-}
-
 ExceptionOr<bool> InternalSettings::deferredCSSParserEnabled()
 {
     if (!m_page)
index a3f6aee..754be63 100644 (file)
@@ -96,8 +96,6 @@ public:
     ExceptionOr<void> setUserInterfaceDirectionPolicy(const String&);
     ExceptionOr<String> systemLayoutDirection();
     ExceptionOr<void> setSystemLayoutDirection(const String&);
-    ExceptionOr<bool> variationFontsEnabled();
-    ExceptionOr<void> setVariationFontsEnabled(bool);
     
     ExceptionOr<bool> deferredCSSParserEnabled();
     ExceptionOr<void> setDeferredCSSParserEnabled(bool);
@@ -177,9 +175,6 @@ private:
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
         bool m_indexedDBWorkersEnabled;
 #endif
-#if ENABLE(VARIATION_FONTS)
-        bool m_variationFontsEnabled;
-#endif
         bool m_deferredCSSParserEnabled;
         bool m_inputEventsEnabled;
 
index e2b770d..1fc8c0d 100644 (file)
@@ -89,9 +89,6 @@ enum ForcedAccessibilityValue { "system", "on", "off" };
     [MayThrowException] DOMString systemLayoutDirection();
     [MayThrowException] void setSystemLayoutDirection(DOMString direction);
 
-    [MayThrowException] boolean variationFontsEnabled();
-    [MayThrowException] void setVariationFontsEnabled(boolean enabled);
-
     [MayThrowException] boolean deferredCSSParserEnabled();
     [MayThrowException] void setDeferredCSSParserEnabled(boolean enabled);
 
index b894e96..5c138e0 100644 (file)
@@ -1,3 +1,16 @@
+2017-01-04  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        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):
+
 2017-01-04  Ryan Haddad  <ryanhaddad@apple.com>
 
         Unreviewed, rolling out r210287.
index a205d12..2426246 100644 (file)
     macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Spring Animations", "CSS Spring Animation prototype") \
     macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Gamepads", "Web Gamepad API support") \
     macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, false, "Modern Media Controls", "Use modern media controls look") \
-    macro(VariationFontsEnabled, variationFontsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Variation Fonts", "Enable variation fonts") \
     macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
     macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
     macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "WebGL 2.0", "WebGL 2 prototype") \
index e79a4fa..bebcca6 100644 (file)
@@ -85,8 +85,6 @@ static NSString * const WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey = @"
 static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
 static NSString * const WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey = @"WebKitNetworkLoadThrottleLatencyMilliseconds";
 
-static NSString * const WebKitVariationFontsEnabledDefaultsKey = @"ExperimentalVariationFontsEnabled";
-
 #if ENABLE(NETWORK_CAPTURE)
 static NSString * const WebKitRecordReplayModeDefaultsKey = @"WebKitRecordReplayMode";
 static NSString * const WebKitRecordReplayCacheLocationDefaultsKey = @"WebKitRecordReplayCacheLocation";
@@ -114,8 +112,6 @@ static void registerUserDefaultsIfNeeded()
     [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
 #endif
 
-    [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitVariationFontsEnabledDefaultsKey];
-
     [[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
 }
 
index 6cc2f73..d17a7fc 100644 (file)
@@ -3207,10 +3207,6 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
 
     settings.setVisualViewportEnabled(store.getBoolValueForKey(WebPreferencesKey::visualViewportEnabledKey()));
 
-#if ENABLE(VARIATION_FONTS)
-    settings.setVariationFontsEnabled(store.getBoolValueForKey(WebPreferencesKey::variationFontsEnabledKey()));
-#endif
-
     settings.setInputEventsEnabled(store.getBoolValueForKey(WebPreferencesKey::inputEventsEnabledKey()));
     RuntimeEnabledFeatures::sharedFeatures().setInputEventsEnabled(store.getBoolValueForKey(WebPreferencesKey::inputEventsEnabledKey()));