Changeset 207568 in webkit


Ignore:
Timestamp:
Oct 19, 2016, 2:14:04 PM (9 years ago)
Author:
Ryan Haddad
Message:

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

Location:
trunk
Files:
1 deleted
14 edited
6 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r207564 r207568  
     12016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207557.
     4
     5        This change caused animations/font-variations tests to time
     6        out on pre-Sierra Macs.
     7
     8        Reverted changeset:
     9
     10        "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
     11        iOS 9"
     12        https://bugs.webkit.org/show_bug.cgi?id=163374
     13        http://trac.webkit.org/changeset/207557
     14
    1152016-10-19  Nan Wang  <n_wang@apple.com>
    216

  • trunk/LayoutTests/animations/font-variation-settings-expected.html

    r207567 r207568  
    88</head>
    99<body>
    10 <div style="font: 100px '-apple-system'; font-variation-settings: 'wght' 1.3">Hello</div>
    11 <div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: 'wght' 0.4<br>
    12 PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 0.7<br>
    13 PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 1.3</div>
     10<div style="font: 100px 'Skia'; font-variation-settings: 'wght' 2.3">Hello</div>
     11<div>PASS - "font-variation-settings" property for "box" element at 0.5s saw something close to: 'wght' 0.95<br>
     12PASS - "font-variation-settings" property for "box" element at 1s saw something close to: 'wght' 1.4<br>
     13PASS - "font-variation-settings" property for "box" element at 2s saw something close to: 'wght' 2.3</div>
    1414</body>
    1515</html>

  • trunk/LayoutTests/animations/font-variation-settings-order.html

    r207567 r207568  
    66    window.internals.settings.setVariationFontsEnabled(true);
    77</script>
    8 <script src="../resources/animation-test-helpers.js"></script>
     8<script src="resources/animation-test-helpers.js"></script>
    99<style>
    1010@keyframes "weightAnimation" {

  • trunk/LayoutTests/animations/font-variation-settings-unlike.html

    r207567 r207568  
    66    window.internals.settings.setVariationFontsEnabled(true);
    77</script>
    8 <script src="../resources/animation-test-helpers.js"></script>
     8<script src="resources/animation-test-helpers.js"></script>
    99<style>
    1010@keyframes "weightAnimation" {

  • trunk/LayoutTests/animations/font-variation-settings.html

    r207567 r207568  
    66    window.internals.settings.setVariationFontsEnabled(true);
    77</script>
    8 <script src="../resources/animation-test-helpers.js"></script>
     8<script>
     9if (window.internals)
     10    window.internals.settings.setVariationFontsEnabled(true);
     11</script>
     12<script src="resources/animation-test-helpers.js"></script>
    913<style>
    1014@keyframes "weightAnimation" {
    1115    from {
    12         font-variation-settings: "wght" 0.1;
     16        font-variation-settings: "wght" 0.5;
    1317    }
    1418    to {
    15         font-variation-settings: "wght" 1.9;
     19        font-variation-settings: "wght" 3.2;
    1620    }
    1721}
    1822
    1923#box {
    20     font: 100px "-apple-system";
     24    font: 100px "Skia";
    2125    animation-name: "weightAnimation";
    2226    animation-duration: 3s;
    … …  
    3135var expectedValues = [
    3236    // [animation-name, time, element-id, property, expected-value, tolerance]
    33     ["weightAnimation", 0.5, "box", "font-variation-settings", "'wght' 0.4", 0.05],
    34     ["weightAnimation", 1.0, "box", "font-variation-settings", "'wght' 0.7", 0.05],
    35     ["weightAnimation", 2.0, "box", "font-variation-settings", "'wght' 1.3", 0.05],
     37    ["weightAnimation", 0.5, "box", "font-variation-settings", "'wght' 0.95", 0.05],
     38    ["weightAnimation", 1.0, "box", "font-variation-settings", "'wght' 1.4", 0.05],
     39    ["weightAnimation", 2.0, "box", "font-variation-settings", "'wght' 2.3", 0.05],
    3640];
    3741runAnimationTest(expectedValues, undefined, undefined, undefined, true, undefined);

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r207557 r207568  
    722722# Font variations build flag is turned off
    723723webkit.org/b/162815 fast/text/variations/ [ Skip ]
    724 webkit.org/b/162815 animations/font-variations/font-variation-settings-unlike.html [ ImageOnlyFailure ]
    725 webkit.org/b/162815 animations/font-variations/font-variation-settings-order.html [ Timeout ]
    726 webkit.org/b/162815 animations/font-variations/font-variation-settings.html [ Timeout ]
     724webkit.org/b/162815 animations/font-variation-settings-unlike.html [ ImageOnlyFailure ]
     725webkit.org/b/162815 animations/font-variation-settings-order.html [ Timeout ]
     726webkit.org/b/162815 animations/font-variation-settings.html [ Timeout ]
    727727
    728728#////////////////////////////////////////////////////////////////////////////////////////

  • trunk/LayoutTests/platform/ios-simulator/TestExpectations

    r207557 r207568  
    27122712webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size-iframe.html [ Skip ]
    27132713webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
    2714 
    2715 # These font variation tests require a variation font which supports more than 2 axes.
    2716 animations/font-variations/font-variation-settings-order.html [ Pass ImageOnlyFailure Failure ]
    2717 animations/font-variations/font-variation-settings-unlike.html [ Pass ImageOnlyFailure Failure ]
    2718 
    2719 webkit.org/b/163632 animations/font-variations/font-variation-settings.html [ Skip ]
    2720 webkit.org/b/163632 fast/text/variations/getComputedStyle.html [ Skip ]

  • trunk/LayoutTests/platform/mac/TestExpectations

    r207557 r207568  
    14661466# rdar://problem/28586837
    14671467fast/text/variations/order.html [ Crash ]
    1468 animations/font-variations/font-variation-settings-order.html [ Crash ]
    1469 # Variation fonts are not implemented earlier than Sierra.
    1470 [ ElCapitan Yosemite ] fast/text/variations [ Pass Failure ImageOnlyFailure ]
    1471 [ ElCapitan Yosemite ] animations/font-variations [ Pass Failure ImageOnlyFailure ]
     1468animations/font-variation-settings-order.html [ Crash ]
    14721469
    14731470[ Debug ] fast/selectors/slow-style-sharing-with-long-cousin-list.html [ Skip ]

  • trunk/Source/JavaScriptCore/ChangeLog

    r207566 r207568  
     12016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207557.
     4
     5        This change caused animations/font-variations tests to time
     6        out on pre-Sierra Macs.
     7
     8        Reverted changeset:
     9
     10        "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
     11        iOS 9"
     12        https://bugs.webkit.org/show_bug.cgi?id=163374
     13        http://trac.webkit.org/changeset/207557
     14
    1152016-10-19  Filip Pizlo  <fpizlo@apple.com>
    216

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r207557 r207568  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    36 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    37 
    3834ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    3935ENABLE_ACCELERATED_2D_CANVAS = ;
    … …  
    4541ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    4642ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    47 
    48 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    49 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    50 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    51 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    52 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     43ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     44ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
     45ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
    5346
    5447ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
    … …  
    207200ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
    208201
    209 ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
    210 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
    211 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
    212 ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
    213 ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
    214 
    215 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    216 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    217 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    218 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    219 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     202ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
    220203
    221204FEATURE_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_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);

  • trunk/Source/WebCore/ChangeLog

    r207567 r207568  
     12016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207557.
     4
     5        This change caused animations/font-variations tests to time
     6        out on pre-Sierra Macs.
     7
     8        Reverted changeset:
     9
     10        "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
     11        iOS 9"
     12        https://bugs.webkit.org/show_bug.cgi?id=163374
     13        http://trac.webkit.org/changeset/207557
     14
    1152016-10-19  Dave Hyatt  <hyatt@apple.com>
    216

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r207557 r207568  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    36 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    37 
    3834ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    3935ENABLE_ACCELERATED_2D_CANVAS = ;
    … …  
    4541ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    4642ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    47 
    48 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    49 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    50 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    51 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    52 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     43ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     44ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
     45ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
    5346
    5447ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
    … …  
    207200ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
    208201
    209 ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
    210 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
    211 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
    212 ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
    213 ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
    214 
    215 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    216 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    217 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    218 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    219 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     202ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
    220203
    221204FEATURE_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_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);

  • trunk/Source/WebKit/mac/ChangeLog

    r207562 r207568  
     12016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207557.
     4
     5        This change caused animations/font-variations tests to time
     6        out on pre-Sierra Macs.
     7
     8        Reverted changeset:
     9
     10        "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
     11        iOS 9"
     12        https://bugs.webkit.org/show_bug.cgi?id=163374
     13        http://trac.webkit.org/changeset/207557
     14
    1152016-10-19  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r207557 r207568  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    36 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    37 
    3834ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    3935ENABLE_ACCELERATED_2D_CANVAS = ;
    … …  
    4541ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    4642ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    47 
    48 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    49 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    50 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    51 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    52 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     43ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     44ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
     45ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
    5346
    5447ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
    … …  
    207200ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
    208201
    209 ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
    210 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
    211 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
    212 ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
    213 ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
    214 
    215 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    216 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    217 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    218 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    219 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     202ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
    220203
    221204FEATURE_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_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);

  • trunk/Source/WebKit2/ChangeLog

    r207563 r207568  
     12016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207557.
     4
     5        This change caused animations/font-variations tests to time
     6        out on pre-Sierra Macs.
     7
     8        Reverted changeset:
     9
     10        "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
     11        iOS 9"
     12        https://bugs.webkit.org/show_bug.cgi?id=163374
     13        http://trac.webkit.org/changeset/207557
     14
    1152016-10-19  Andy Estes  <aestes@apple.com>
    216

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r207557 r207568  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    36 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    37 
    3834ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    3935ENABLE_ACCELERATED_2D_CANVAS = ;
    … …  
    4541ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    4642ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    47 
    48 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    49 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    50 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    51 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    52 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     43ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     44ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
     45ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
    5346
    5447ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
    … …  
    207200ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
    208201
    209 ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
    210 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
    211 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
    212 ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
    213 ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
    214 
    215 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    216 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    217 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    218 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    219 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     202ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
    220203
    221204FEATURE_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_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);

  • trunk/Tools/ChangeLog

    r207563 r207568  
     12016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207557.
     4
     5        This change caused animations/font-variations tests to time
     6        out on pre-Sierra Macs.
     7
     8        Reverted changeset:
     9
     10        "[macOS] [iOS] Disable variation fonts on macOS El Capitan and
     11        iOS 9"
     12        https://bugs.webkit.org/show_bug.cgi?id=163374
     13        http://trac.webkit.org/changeset/207557
     14
    1152016-10-19  Andy Estes  <aestes@apple.com>
    216

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r207557 r207568  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101000 = YES;
    36 TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000_101100 = YES;
    37 
    3834ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    3935ENABLE_ACCELERATED_2D_CANVAS = ;
    … …  
    4541ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    4642ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    47 
    48 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    49 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    50 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    51 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    52 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     43ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     44ENABLE_APPLE_PAY_macosx_101200 = ENABLE_APPLE_PAY;
     45ENABLE_APPLE_PAY_macosx_101300 = ENABLE_APPLE_PAY;
    5346
    5447ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
    … …  
    207200ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
    208201
    209 ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
    210 ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
    211 ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
    212 ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
    213 ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
    214 
    215 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
    216 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    217 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    218 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    219 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     202ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
    220203
    221204FEATURE_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_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
Note: See TracChangeset for help on using the changeset viewer.