Diff
Modified: trunk/LayoutTests/ChangeLog (210314 => 210315)
--- trunk/LayoutTests/ChangeLog 2017-01-05 04:04:43 UTC (rev 210314)
+++ trunk/LayoutTests/ChangeLog 2017-01-05 04:35:48 UTC (rev 210315)
@@ -1,3 +1,28 @@
+2017-01-04 Myles C. Maxfield <mmaxfi...@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_w...@apple.com>
Many new HTML5 input types still exposed as generic AXTextfield
Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html (210314 => 210315)
--- 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)
@@ -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 @@
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>
Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html (210314 => 210315)
--- 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)
@@ -1,10 +1,6 @@
<!DOCTYPE html>
<html>
<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
<script src=""
<style>
@keyframes weightAnimation {
Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html (210314 => 210315)
--- 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)
@@ -1,10 +1,6 @@
<!DOCTYPE html>
<html>
<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
<script src=""
<style>
@keyframes weightAnimation {
Modified: trunk/LayoutTests/animations/font-variations/font-variation-settings.html (210314 => 210315)
--- 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)
@@ -1,10 +1,6 @@
<!DOCTYPE html>
<html>
<head>
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
<script src=""
<style>
@keyframes weightAnimation {
Modified: trunk/LayoutTests/fast/text/variations/duplicate-expected.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/duplicate.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/exist.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/getComputedStyle.html (210314 => 210315)
--- 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)
@@ -2,10 +2,6 @@
<html>
<head>
<meta charset="utf-8">
-<script>
-if (window.internals)
- window.internals.settings.setVariationFontsEnabled(true);
-</script>
<script src=""
</head>
<body>
@@ -29,4 +25,4 @@
</script>
<script src=""
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/LayoutTests/fast/text/variations/inheritance-expected.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/inheritance.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/order-expected.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/order.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/LayoutTests/fast/text/variations/outofbounds.html (210314 => 210315)
--- 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)
@@ -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>
Modified: trunk/Source/WebCore/ChangeLog (210314 => 210315)
--- 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)
@@ -1,3 +1,41 @@
+2017-01-04 Myles C. Maxfield <mmaxfi...@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 <aes...@apple.com>
[Cocoa] Teach SharedBuffer to return an NSArray of data segments to avoid flattening
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (210314 => 210315)
--- 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)
@@ -2911,16 +2911,13 @@
}
#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)
Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (210314 => 210315)
--- 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)
@@ -92,10 +92,6 @@
textAutosizingEnabled = settings->textAutosizingEnabled();
#endif
springTimingFunctionEnabled = settings->springTimingFunctionEnabled();
-
-#if ENABLE(VARIATION_FONTS)
- variationFontsEnabled = settings->variationFontsEnabled();
-#endif
deferredCSSParserEnabled = settings->deferredCSSParserEnabled();
}
@@ -119,9 +115,6 @@
&& 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;
}
Modified: trunk/Source/WebCore/css/parser/CSSParserMode.h (210314 => 210315)
--- 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)
@@ -117,10 +117,6 @@
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 @@
& 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;
}
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (210314 => 210315)
--- 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)
@@ -3656,9 +3656,7 @@
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);
Modified: trunk/Source/WebCore/page/Settings.in (210314 => 210315)
--- 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)
@@ -275,8 +275,6 @@
treatIPAddressAsDomain initial=false
-variationFontsEnabled initial=true, setNeedsStyleRecalcInAllFrames=1, conditional=VARIATION_FONTS
-
# Runtime-enabled features
visualViewportEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (210314 => 210315)
--- 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)
@@ -90,9 +90,6 @@
#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 @@
#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 @@
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)
Modified: trunk/Source/WebCore/testing/InternalSettings.h (210314 => 210315)
--- 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)
@@ -96,8 +96,6 @@
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 @@
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
bool m_indexedDBWorkersEnabled;
#endif
-#if ENABLE(VARIATION_FONTS)
- bool m_variationFontsEnabled;
-#endif
bool m_deferredCSSParserEnabled;
bool m_inputEventsEnabled;
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (210314 => 210315)
--- 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)
@@ -89,9 +89,6 @@
[MayThrowException] DOMString systemLayoutDirection();
[MayThrowException] void setSystemLayoutDirection(DOMString direction);
- [MayThrowException] boolean variationFontsEnabled();
- [MayThrowException] void setVariationFontsEnabled(boolean enabled);
-
[MayThrowException] boolean deferredCSSParserEnabled();
[MayThrowException] void setDeferredCSSParserEnabled(boolean enabled);
Modified: trunk/Source/WebKit2/ChangeLog (210314 => 210315)
--- 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)
@@ -1,3 +1,16 @@
+2017-01-04 Myles C. Maxfield <mmaxfi...@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 <ryanhad...@apple.com>
Unreviewed, rolling out r210287.
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (210314 => 210315)
--- 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)
@@ -317,7 +317,6 @@
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") \
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (210314 => 210315)
--- 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)
@@ -85,8 +85,6 @@
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 @@
[registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
#endif
- [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitVariationFontsEnabledDefaultsKey];
-
[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (210314 => 210315)
--- 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)
@@ -3207,10 +3207,6 @@
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()));
