Diff
Modified: trunk/LayoutTests/ChangeLog (207567 => 207568)
--- trunk/LayoutTests/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1,3 +1,17 @@
+2016-10-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
2016-10-19 Nan Wang <n_w...@apple.com>
AX: crash: com.apple.WebCore: WebCore::AccessibilityObject::findMatchingObjects + 600
Copied: trunk/LayoutTests/animations/font-variation-settings-expected.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-expected.html) (0 => 207568)
--- trunk/LayoutTests/animations/font-variation-settings-expected.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-expected.html 2016-10-19 21:14:04 UTC (rev 207568)
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font: 100px 'Skia'; font-variation-settings: 'wght' 2.3">Hello</div>
+<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: 'wght' 0.95<br>
+PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 1.4<br>
+PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 2.3</div>
+</body>
+</html>
\ No newline at end of file
Copied: trunk/LayoutTests/animations/font-variation-settings-order-expected.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-order-expected.html) (0 => 207568)
--- trunk/LayoutTests/animations/font-variation-settings-order-expected.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-order-expected.html 2016-10-19 21:14:04 UTC (rev 207568)
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font: 100px 'Skia'; font-variation-settings: 'wght' 2.3, 'wdth' 1.1">Hello</div>
+<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: 'wght' 0.95, 'wdth' 0.95<br>
+PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 1.4, 'wdth' 1<br>
+PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 2.3, 'wdth' 1.1</div>
+</body>
+</html>
Copied: trunk/LayoutTests/animations/font-variation-settings-order.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-order.html) (0 => 207568)
--- trunk/LayoutTests/animations/font-variation-settings-order.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-order.html 2016-10-19 21:14:04 UTC (rev 207568)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script src=""
+<style>
+@keyframes "weightAnimation" {
+ from {
+ font-variation-settings: "wght" 0.5, "wdth" 0.9;
+ }
+ to {
+ font-variation-settings: "wdth" 1.2, "wght" 3.2;
+ }
+}
+
+#box {
+ font: 100px "Skia";
+ animation-name: "weightAnimation";
+ animation-duration: 3s;
+ animation-timing-function: linear;
+}
+</style>
+</head>
+<body>
+<div id="box">Hello</div>
+<div id="result"></div>
+<script>
+var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["weightAnimation", 0.5, "box", "font-variation-settings", "'wght' 0.95, 'wdth' 0.95", 0.05],
+ ["weightAnimation", 1.0, "box", "font-variation-settings", "'wght' 1.4, 'wdth' 1", 0.05],
+ ["weightAnimation", 2.0, "box", "font-variation-settings", "'wght' 2.3, 'wdth' 1.1", 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+</script>
+</body>
+</html>
\ No newline at end of file
Copied: trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike-expected.html) (0 => 207568)
--- trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-unlike-expected.html 2016-10-19 21:14:04 UTC (rev 207568)
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font: 100px 'Skia';">Hello</div>
+<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: normal<br>
+PASS - "font-variation-settings" property for "box" element at 1s saw something close to: normal<br>
+PASS - "font-variation-settings" property for "box" element at 2s saw something close to: normal</div>
+</body>
+</html>
Copied: trunk/LayoutTests/animations/font-variation-settings-unlike.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings-unlike.html) (0 => 207568)
--- trunk/LayoutTests/animations/font-variation-settings-unlike.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings-unlike.html 2016-10-19 21:14:04 UTC (rev 207568)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script src=""
+<style>
+@keyframes "weightAnimation" {
+ from {
+ font-variation-settings: "wght" 0.5, "wdth" 0.9;
+ }
+ to {
+ font-variation-settings: "wght" 3.2;
+ }
+}
+
+#box {
+ font: 100px "Skia";
+ animation-name: "weightAnimation";
+ animation-duration: 3s;
+ animation-timing-function: linear;
+}
+</style>
+</head>
+<body>
+<div id="box">Hello</div>
+<div id="result"></div>
+<script>
+var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["weightAnimation", 0.5, "box", "font-variation-settings", "normal", 0.05],
+ ["weightAnimation", 1.0, "box", "font-variation-settings", "normal", 0.05],
+ ["weightAnimation", 2.0, "box", "font-variation-settings", "normal", 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+</script>
+</body>
+</html>
\ No newline at end of file
Copied: trunk/LayoutTests/animations/font-variation-settings.html (from rev 207567, trunk/LayoutTests/animations/font-variations/font-variation-settings.html) (0 => 207568)
--- trunk/LayoutTests/animations/font-variation-settings.html (rev 0)
+++ trunk/LayoutTests/animations/font-variation-settings.html 2016-10-19 21:14:04 UTC (rev 207568)
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+<script src=""
+<style>
+@keyframes "weightAnimation" {
+ from {
+ font-variation-settings: "wght" 0.5;
+ }
+ to {
+ font-variation-settings: "wght" 3.2;
+ }
+}
+
+#box {
+ font: 100px "Skia";
+ animation-name: "weightAnimation";
+ animation-duration: 3s;
+ animation-timing-function: linear;
+}
+</style>
+</head>
+<body>
+<div id="box">Hello</div>
+<div id="result"></div>
+<script>
+var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["weightAnimation", 0.5, "box", "font-variation-settings", "'wght' 0.95", 0.05],
+ ["weightAnimation", 1.0, "box", "font-variation-settings", "'wght' 1.4", 0.05],
+ ["weightAnimation", 2.0, "box", "font-variation-settings", "'wght' 2.3", 0.05],
+];
+runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);
+</script>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (207567 => 207568)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-10-19 21:14:04 UTC (rev 207568)
@@ -721,9 +721,9 @@
# Font variations build flag is turned off
webkit.org/b/162815 fast/text/variations/ [ Skip ]
-webkit.org/b/162815 animations/font-variations/font-variation-settings-unlike.html [ ImageOnlyFailure ]
-webkit.org/b/162815 animations/font-variations/font-variation-settings-order.html [ Timeout ]
-webkit.org/b/162815 animations/font-variations/font-variation-settings.html [ Timeout ]
+webkit.org/b/162815 animations/font-variation-settings-unlike.html [ ImageOnlyFailure ]
+webkit.org/b/162815 animations/font-variation-settings-order.html [ Timeout ]
+webkit.org/b/162815 animations/font-variation-settings.html [ Timeout ]
#////////////////////////////////////////////////////////////////////////////////////////
# End of Expected failures
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (207567 => 207568)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-19 21:14:04 UTC (rev 207568)
@@ -2711,10 +2711,3 @@
webkit.org/b/163307 [ Debug ] loader/stateobjects/pushstate-size.html [ Skip ]
webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size-iframe.html [ Skip ]
webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
-
-# These font variation tests require a variation font which supports more than 2 axes.
-animations/font-variations/font-variation-settings-order.html [ Pass ImageOnlyFailure Failure ]
-animations/font-variations/font-variation-settings-unlike.html [ Pass ImageOnlyFailure Failure ]
-
-webkit.org/b/163632 animations/font-variations/font-variation-settings.html [ Skip ]
-webkit.org/b/163632 fast/text/variations/getComputedStyle.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (207567 => 207568)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1465,10 +1465,7 @@
# rdar://problem/28586837
fast/text/variations/order.html [ Crash ]
-animations/font-variations/font-variation-settings-order.html [ Crash ]
-# Variation fonts are not implemented earlier than Sierra.
-[ ElCapitan Yosemite ] fast/text/variations [ Pass Failure ImageOnlyFailure ]
-[ ElCapitan Yosemite ] animations/font-variations [ Pass Failure ImageOnlyFailure ]
+animations/font-variation-settings-order.html [ Crash ]
[ Debug ] fast/selectors/slow-style-sharing-with-long-cousin-list.html [ Skip ]
Modified: trunk/Source/_javascript_Core/ChangeLog (207567 => 207568)
--- trunk/Source/_javascript_Core/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1,3 +1,17 @@
+2016-10-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
2016-10-19 Filip Pizlo <fpi...@apple.com>
Baseline JIT should use AutomaticThread
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (207567 => 207568)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
@@ -31,10 +31,6 @@
// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -44,13 +40,10 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -206,16 +199,6 @@
ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
Modified: trunk/Source/WebCore/ChangeLog (207567 => 207568)
--- trunk/Source/WebCore/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1,3 +1,17 @@
+2016-10-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
2016-10-19 Dave Hyatt <hy...@apple.com>
[CSS Parser] Support -webkit-border-fit
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (207567 => 207568)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
@@ -31,10 +31,6 @@
// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -44,13 +40,10 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -206,16 +199,6 @@
ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
Modified: trunk/Source/WebKit/mac/ChangeLog (207567 => 207568)
--- trunk/Source/WebKit/mac/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1,3 +1,17 @@
+2016-10-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
2016-10-19 Chris Dumez <cdu...@apple.com>
Move HTML Interactive Form Validation behind an experimental flag
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (207567 => 207568)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
@@ -31,10 +31,6 @@
// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -44,13 +40,10 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -206,16 +199,6 @@
ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
Modified: trunk/Source/WebKit2/ChangeLog (207567 => 207568)
--- trunk/Source/WebKit2/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1,3 +1,17 @@
+2016-10-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
2016-10-19 Andy Estes <aes...@apple.com>
Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (207567 => 207568)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
@@ -31,10 +31,6 @@
// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -44,13 +40,10 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -206,16 +199,6 @@
ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
Modified: trunk/Tools/ChangeLog (207567 => 207568)
--- trunk/Tools/ChangeLog 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Tools/ChangeLog 2016-10-19 21:14:04 UTC (rev 207568)
@@ -1,3 +1,17 @@
+2016-10-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r207557.
+
+ This change caused animations/font-variations tests to time
+ out on pre-Sierra Macs.
+
+ Reverted changeset:
+
+ "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
+ iOS 9"
+ https://bugs.webkit.org/show_bug.cgi?id=163374
+ http://trac.webkit.org/changeset/207557
+
2016-10-19 Andy Estes <aes...@apple.com>
Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (207567 => 207568)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-19 20:45:08 UTC (rev 207567)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-19 21:14:04 UTC (rev 207568)
@@ -31,10 +31,6 @@
// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
-TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
-
ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
ENABLE_ACCELERATED_2D_CANVAS = ;
ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
@@ -44,13 +40,10 @@
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
+ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
-DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
-ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
-ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_IF_NOT_YES = ;
-
ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
@@ -206,16 +199,6 @@
ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
-ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
-ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
-ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
-
FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6
_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_
SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMIN
G) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
