Diff
Modified: trunk/Source/WTF/ChangeLog (248949 => 248950)
--- trunk/Source/WTF/ChangeLog 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WTF/ChangeLog 2019-08-21 18:02:02 UTC (rev 248950)
@@ -1,3 +1,20 @@
+2019-08-21 Keith Rollin <krol...@apple.com>
+
+ Remove support for watchOS < 6.0
+ https://bugs.webkit.org/show_bug.cgi?id=200937
+ <rdar://problem/54524009>
+
+ Reviewed by Darin Adler.
+
+ Update conditionals that reference __WATCH_OS_VERSION_MIN_REQUIRED and
+ __WATCH_OS_VERSION_MAX_ALLOWED, assuming that they both have values >=
+ 60000. This means that expressions like
+ "__WATCH_OS_VERSION_MIN_REQUIRED < 60000" are always False and
+ "__WATCH_OS_VERSION_MIN_REQUIRED >= 60000" are always True.
+
+ * wtf/FeatureDefines.h:
+ * wtf/Platform.h:
+
2019-08-20 Mark Lam <mark....@apple.com>
Make it easier to pass pointers to WTFCrashWithInfo.
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (248949 => 248950)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2019-08-21 18:02:02 UTC (rev 248950)
@@ -192,7 +192,7 @@
#endif
#if !defined(HAVE_UISCENE)
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000)
+#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS)
#define HAVE_UISCENE 1
#endif
#endif
Modified: trunk/Source/WTF/wtf/Platform.h (248949 => 248950)
--- trunk/Source/WTF/wtf/Platform.h 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WTF/wtf/Platform.h 2019-08-21 18:02:02 UTC (rev 248950)
@@ -1514,7 +1514,7 @@
#define HAVE_AUTHORIZATION_STATUS_FOR_MEDIA_TYPE 1
#endif
-#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) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000 && __WATCH_OS_VERSION_MAX_ALLOWED >= 50200) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000 && __TV_OS_VERSION_MAX_ALLOWED >= 120200)
+#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) && __TV_OS_VERSION_MIN_REQUIRED >= 120000 && __TV_OS_VERSION_MAX_ALLOWED >= 120200)
#define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 1
#endif
@@ -1568,16 +1568,16 @@
#define ENABLE_PLATFORM_DRIVEN_TEXT_CHECKING 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_ALLOWS_SENSITIVE_LOGGING 1
#define HAVE_FAIRPLAYSTREAMING_CENC_INITDATA 1
#endif
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI 1
#endif
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_APP_LINKS_WITH_ISENABLED 1
#endif
@@ -1593,15 +1593,15 @@
#define USE_REALPATH_FOR_DLOPEN_PREFLIGHT 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_NSURLSESSION_WEBSOCKET 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_AVPLAYER_RESOURCE_CONSERVATION_LEVEL 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000)
#define HAVE_CORETEXT_AUTO_OPTICAL_SIZING 1
#endif
@@ -1617,15 +1617,15 @@
#define HAVE_SUBVIEWS_IVAR_SPI 1
#endif
-#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110000)
#define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_DESIGN_SYSTEM_UI_FONTS 1
#endif
-#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define USE_HIRAGINO_SANS_WORKAROUND 1
#endif
Modified: trunk/Source/WebCore/PAL/ChangeLog (248949 => 248950)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-08-21 18:02:02 UTC (rev 248950)
@@ -1,3 +1,21 @@
+2019-08-21 Keith Rollin <krol...@apple.com>
+
+ Remove support for watchOS < 6.0
+ https://bugs.webkit.org/show_bug.cgi?id=200937
+ <rdar://problem/54524009>
+
+ Reviewed by Darin Adler.
+
+ Update conditionals that reference __WATCH_OS_VERSION_MIN_REQUIRED and
+ __WATCH_OS_VERSION_MAX_ALLOWED, assuming that they both have values >=
+ 60000. This means that expressions like
+ "__WATCH_OS_VERSION_MIN_REQUIRED < 60000" are always False and
+ "__WATCH_OS_VERSION_MIN_REQUIRED >= 60000" are always True.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+ * pal/spi/cocoa/NSKeyedArchiverSPI.h:
+ * pal/spi/cocoa/NSProgressSPI.h:
+
2019-08-19 Jer Noble <jer.no...@apple.com>
[Cocoa] Adopt -preventDisplaySleepForVideoPlayback
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (248949 => 248950)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-08-21 18:02:02 UTC (rev 248950)
@@ -174,7 +174,7 @@
- (NSDate *)_lastModifiedDate;
@end
-#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
+#if PLATFORM(WATCHOS)
typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
NSURLSessionCompanionProxyPreferenceDefault = 0,
NSURLSessionCompanionProxyPreferencePreferCompanion,
@@ -195,7 +195,7 @@
#if HAVE(CFNETWORK_WITH_AUTO_ADDED_HTTP_HEADER_SUPPRESSION_SUPPORT)
@property (nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders;
#endif
-#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
+#if PLATFORM(WATCHOS)
@property NSURLSessionCompanionProxyPreference _companionProxyPreference;
#endif
#if HAVE(APP_SSO)
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h (248949 => 248950)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2019-08-21 18:02:02 UTC (rev 248950)
@@ -29,9 +29,9 @@
#import <wtf/Assertions.h>
#import <wtf/RetainPtr.h>
-#define USE_SECURE_ARCHIVER_API (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40200) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110200))
+#define USE_SECURE_ARCHIVER_API (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110200))
-#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000))
+#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000))
#if USE(SECURE_ARCHIVER_API)
#if USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h (248949 => 248950)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h 2019-08-21 18:02:02 UTC (rev 248950)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#define USE_NSPROGRESS_PUBLISHING_SPI ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 130000))
+#define USE_NSPROGRESS_PUBLISHING_SPI ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 130000))
#import <Foundation/NSProgress_Private.h>
#else
Modified: trunk/Source/WebKit/ChangeLog (248949 => 248950)
--- trunk/Source/WebKit/ChangeLog 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WebKit/ChangeLog 2019-08-21 18:02:02 UTC (rev 248950)
@@ -1,3 +1,20 @@
+2019-08-21 Keith Rollin <krol...@apple.com>
+
+ Remove support for watchOS < 6.0
+ https://bugs.webkit.org/show_bug.cgi?id=200937
+ <rdar://problem/54524009>
+
+ Reviewed by Darin Adler.
+
+ Update conditionals that reference __WATCH_OS_VERSION_MIN_REQUIRED and
+ __WATCH_OS_VERSION_MAX_ALLOWED, assuming that they both have values >=
+ 60000. This means that expressions like
+ "__WATCH_OS_VERSION_MIN_REQUIRED < 60000" are always False and
+ "__WATCH_OS_VERSION_MIN_REQUIRED >= 60000" are always True.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+
2019-08-21 Adrian Perez de Castro <ape...@igalia.com>
[GTK] Build failure due to unwieldy definition of “None” from X11 headers
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (248949 => 248950)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-08-21 18:02:02 UTC (rev 248950)
@@ -990,7 +990,7 @@
configuration._socketStreamProperties = @{ @"kCFStreamPropertyAutoErrorOnSystemChange" : @NO };
#endif
-#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000
+#if PLATFORM(WATCHOS)
configuration._companionProxyPreference = NSURLSessionCompanionProxyPreferencePreferDirectToCloud;
#endif
Modified: trunk/Tools/ChangeLog (248949 => 248950)
--- trunk/Tools/ChangeLog 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Tools/ChangeLog 2019-08-21 18:02:02 UTC (rev 248950)
@@ -1,3 +1,20 @@
+2019-08-21 Keith Rollin <krol...@apple.com>
+
+ Remove support for watchOS < 6.0
+ https://bugs.webkit.org/show_bug.cgi?id=200937
+ <rdar://problem/54524009>
+
+ Reviewed by Darin Adler.
+
+ Update conditionals that reference __WATCH_OS_VERSION_MIN_REQUIRED and
+ __WATCH_OS_VERSION_MAX_ALLOWED, assuming that they both have values >=
+ 60000. This means that expressions like
+ "__WATCH_OS_VERSION_MIN_REQUIRED < 60000" are always False and
+ "__WATCH_OS_VERSION_MIN_REQUIRED >= 60000" are always True.
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+ (TestWebKitAPI::TEST):
+
2019-08-20 Zhifei Fang <zhifei_f...@apple.com>
[results.webkit.org Webkit.css] Add right sidebar
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm (248949 => 248950)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2019-08-21 17:49:42 UTC (rev 248949)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2019-08-21 18:02:02 UTC (rev 248950)
@@ -138,12 +138,12 @@
if (PAL::canLoad_AVFoundation_AVSampleRateKey())
EXPECT_TRUE([AVSampleRateKey isEqualToString:@"AVSampleRateKey"]);
-#if PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110000)
EXPECT_TRUE(PAL::canLoad_AVFoundation_AVURLAssetOutOfBandMIMETypeKey());
EXPECT_TRUE([AVURLAssetOutOfBandMIMETypeKey isEqualToString:@"AVURLAssetOutOfBandMIMETypeKey"]);
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000)
EXPECT_TRUE(PAL::canLoad_AVFoundation_AVURLAssetUseClientURLLoadingExclusively());
EXPECT_TRUE([AVURLAssetUseClientURLLoadingExclusively isEqualToString:@"AVURLAssetUseClientURLLoadingExclusively"]);
#endif
@@ -158,7 +158,7 @@
EXPECT_TRUE([AVContentKeyRequestProtocolVersionsKey isEqualToString:@"ProtocolVersionsKey"]);
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
EXPECT_TRUE(PAL::canLoad_AVFoundation_AVVideoCodecTypeHEVCWithAlpha());
EXPECT_TRUE([AVVideoCodecTypeHEVCWithAlpha isEqualToString:@"muxa"]);
#endif
