Changeset 255073 in webkit


Ignore:
Timestamp:
Jan 24, 2020 8:32:26 AM (4 years ago)
Author:
Jonathan Bedard
Message:

WTF: Remove old iOS version macros
https://bugs.webkit.org/show_bug.cgi?id=206634
<rdar://problem/58818561>

Reviewed by Darin Adler.

  • wtf/PlatformEnable.h: Remove iOS 12 version macro.
  • wtf/PlatformHave.h: Ditto.
  • wtf/PlatformUse.h: Ditto.
Location:
trunk/Source/WTF
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r255049 r255073  
     12020-01-24  Jonathan Bedard  <jbedard@apple.com>
     2
     3        WTF: Remove old iOS version macros
     4        https://bugs.webkit.org/show_bug.cgi?id=206634
     5        <rdar://problem/58818561>
     6
     7        Reviewed by Darin Adler.
     8
     9        * wtf/PlatformEnable.h: Remove iOS 12 version macro.
     10        * wtf/PlatformHave.h: Ditto.
     11        * wtf/PlatformUse.h: Ditto.
     12
    1132020-01-22  Darin Adler  <darin@apple.com>
    214
  • trunk/Source/WTF/wtf/PlatformEnable.h

    r255049 r255073  
    201201#endif
    202202
    203 #if !defined(ENABLE_WKPDFVIEW)
    204 #if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
     203#if !defined(ENABLE_WKPDFVIEW) && PLATFORM(IOS)
    205204#define ENABLE_WKPDFVIEW 1
    206 #endif
    207205#endif
    208206
     
    211209#endif
    212210
    213 #if !defined(ENABLE_PREVIEW_CONVERTER)
    214 #if PLATFORM(IOS)
     211#if !defined(ENABLE_PREVIEW_CONVERTER) && PLATFORM(IOS)
    215212#define ENABLE_PREVIEW_CONVERTER 1
    216 #endif
    217213#endif
    218214
     
    10161012#endif
    10171013
    1018 #if !defined(ENABLE_MONOSPACE_FONT_EXCEPTION) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000))
     1014#if !defined(ENABLE_MONOSPACE_FONT_EXCEPTION) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || PLATFORM(WATCHOS) || PLATFORM(APPLETV))
    10191015#define ENABLE_MONOSPACE_FONT_EXCEPTION 1
    10201016#endif
  • trunk/Source/WTF/wtf/PlatformHave.h

    r255049 r255073  
    340340#endif
    341341
    342 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     342#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    343343#define HAVE_HSTS_STORAGE_PATH 1
    344344#endif
     
    374374#endif
    375375
    376 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(GTK)
     376#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(GTK)
    377377#define HAVE_OS_DARK_MODE_SUPPORT 1
    378378#endif
     
    423423#endif
    424424
    425 #if (PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101404)) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120200) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     425#if PLATFORM(COCOA) && !(PLATFORM(MAC) && !(__MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101404))
    426426#define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 1
    427427#endif
    428428
    429 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     429#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    430430#define HAVE_CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE 1
    431431#endif
     
    451451#endif
    452452
    453 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     453#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    454454#define HAVE_MDNS_FAST_REGISTRATION 1
    455455#endif
     
    459459#endif
    460460
    461 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     461#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    462462#define HAVE_CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION 1
    463463#endif
    464464
    465 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     465#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    466466#define HAVE_CTFONTTRANSFORMGLYPHSWITHLANGUAGE 1
    467467#endif
    468468
    469 #if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
     469#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
    470470#define HAVE_ARKIT_QUICK_LOOK_PREVIEW_ITEM 1
    471471#endif
    472472
    473 #if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
     473#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
    474474#define HAVE_UI_WK_DOCUMENT_CONTEXT 1
    475475#endif
     
    491491#endif
    492492
    493 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     493#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
    494494#define HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI 1
    495495#endif
    496496
    497 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     497#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
    498498#define HAVE_APP_LINKS_WITH_ISENABLED 1
    499499#endif
    500500
    501 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     501#if PLATFORM(IOS)
    502502#define HAVE_ROUTE_SHARING_POLICY_LONG_FORM_VIDEO 1
    503503#endif
    504504
    505 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && !PLATFORM(IOS_SIMULATOR))
     505#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
    506506#define HAVE_DEVICE_MANAGEMENT 1
    507507#endif
    508508
    509 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     509#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
    510510#define HAVE_NSURLSESSION_WEBSOCKET 1
    511511#endif
    512512
    513 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     513#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(MACCATALYST)
    514514#define HAVE_AVPLAYER_RESOURCE_CONSERVATION_LEVEL 1
    515515#endif
    516516
    517 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     517#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(MACCATALYST)
    518518#define HAVE_CORETEXT_AUTO_OPTICAL_SIZING 1
    519519#endif
    520520
    521 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000)
     521#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
    522522#define HAVE_NSFONT_WITH_OPTICAL_SIZING_BUG 1
    523523#endif
     
    527527#endif
    528528
    529 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000 || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(WATCHOS) || PLATFORM(APPLETV) || PLATFORM(MACCATALYST)
     529#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
    530530#define HAVE_TLS_PROTOCOL_VERSION_T 1
    531531#endif
     
    547547#endif
    548548
    549 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     549#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(MACCATALYST)
    550550#define HAVE_DESIGN_SYSTEM_UI_FONTS 1
    551551#endif
  • trunk/Source/WTF/wtf/PlatformUse.h

    r255049 r255073  
    301301#endif
    302302
    303 #if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
     303#if PLATFORM(COCOA)
    304304#define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
    305305#endif
Note: See TracChangeset for help on using the changeset viewer.