[webkit-changes] [292275] trunk/Source

Sun, 03 Apr 2022 01:04:51 -0700

Title: [292275] trunk/Source
Revision
292275
Author
timothy_hor...@apple.com
Date
2022-04-03 01:04:07 -0700 (Sun, 03 Apr 2022)

Log Message

_WKDataTask doesn't work in macCatalyst
https://bugs.webkit.org/show_bug.cgi?id=238655

Reviewed by Alexey Proskuryakov.

Source/WebCore/PAL:

* pal/spi/cf/CFNetworkSPI.h:

Source/WebKit:

* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]): Deleted.

Source/WTF:

* wtf/PlatformHave.h:
Enable HAVE(NSURLSESSION_TASK_DELEGATE) on macCatalyst.
Drive-by enable a few other things on macCatalyst.
Remove and simplify some always-true version checks.
Leave some comments about ones I'm not sure about.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (292274 => 292275)


--- trunk/Source/WTF/ChangeLog	2022-04-03 05:39:31 UTC (rev 292274)
+++ trunk/Source/WTF/ChangeLog	2022-04-03 08:04:07 UTC (rev 292275)
@@ -1,3 +1,16 @@
+2022-04-03  Tim Horton  <timothy_hor...@apple.com>
+
+        _WKDataTask doesn't work in macCatalyst
+        https://bugs.webkit.org/show_bug.cgi?id=238655
+
+        Reviewed by Alexey Proskuryakov.
+
+        * wtf/PlatformHave.h:
+        Enable HAVE(NSURLSESSION_TASK_DELEGATE) on macCatalyst.
+        Drive-by enable a few other things on macCatalyst.
+        Remove and simplify some always-true version checks.
+        Leave some comments about ones I'm not sure about.
+
 2022-04-02  Chris Dumez  <cdu...@apple.com>
 
         Add default constructor to ASCIILiteral

Modified: trunk/Source/WTF/wtf/PlatformHave.h (292274 => 292275)


--- trunk/Source/WTF/wtf/PlatformHave.h	2022-04-03 05:39:31 UTC (rev 292274)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2022-04-03 08:04:07 UTC (rev 292275)
@@ -249,7 +249,7 @@
 #define HAVE_FAST_TLS 1
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || ((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+    || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST))
 #define HAVE_SIMPLIFIED_FAST_TLS_BASE 1
 #endif
 
@@ -271,7 +271,7 @@
 #define HAVE_CELESTIAL 1
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
+#if PLATFORM(MAC)
 #define HAVE_FIG_PHOTO_DECOMPRESSION_SET_HARDWARE_CUTOFF 1
 #endif
 
@@ -336,16 +336,13 @@
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR))
+// FIXME: Is this really unavailable in the iOS Simulator?
 #define HAVE_IOSURFACE_SET_OWNERSHIP_IDENTITY 1
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || (PLATFORM(IOS) || PLATFORM(MACCATALYST))
 #define HAVE_NETWORK_CONNECTION_PRIVACY_STANCE 1
 #endif
 
@@ -395,8 +392,9 @@
 #define HAVE_AVCONTENTKEYREPORTGROUP 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(MAC) \
+    || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) \
+    || PLATFORM(MACCATALYST)
 #define HAVE_AVCONTENTKEYSESSIONWILLOUTPUTBEOBSCURED 1
 #endif
 
@@ -445,19 +443,15 @@
 #define HAVE_SAFE_BROWSING 1
 #endif
 
-#if PLATFORM(IOS) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_LINK_PREVIEW 1
 #endif
 
 #if PLATFORM(COCOA)
 #define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 1
-#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
 #define HAVE_CFNETWORK_NSURLSESSION_CONNECTION_CACHE_LIMITS 1
+#define HAVE_CFNETWORK_METRICS_APIS_V4 1
+#define HAVE_CFNETWORK_ALTERNATIVE_SERVICE 1
 #endif
 
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
@@ -464,18 +458,6 @@
 #define HAVE_SAFARI_FOR_WEBKIT_DEVELOPMENT_REQUIRING_EXTRA_SYMBOLS 1
 #endif
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 140000
-#define HAVE_BROKEN_DOWNLOAD_RESUME_UNLINK 1
-#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
-#define HAVE_CFNETWORK_METRICS_APIS_V4 1
-#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
-#define HAVE_CFNETWORK_ALTERNATIVE_SERVICE 1
-#endif
-
 #if PLATFORM(MAC)
 #define HAVE_CSCHECKFIXDISABLE 1
 #endif
@@ -537,11 +519,12 @@
 #define HAVE_DEVICE_MANAGEMENT 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
+// FIXME: This should be enabled on watchOS and tvOS, but there are some build failures.
 #define HAVE_NSURLSESSION_WEBSOCKET 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(IOS_FAMILY)
 #define HAVE_NWPARAMETERS_TRACKER_API 1
 #endif
 
@@ -549,7 +532,7 @@
 #define HAVE_AVPLAYER_RESOURCE_CONSERVATION_LEVEL 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_AVPLAYER_SUPRESSES_AUDIO_RENDERING 1
 #endif
 
@@ -569,7 +552,7 @@
 #define HAVE_DESIGN_SYSTEM_UI_FONTS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_COOKIE_CHANGE_LISTENER_API 1
 #endif
 
@@ -581,11 +564,11 @@
 #define HAVE_OS_SIGNPOST 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_AVASSETWRITERDELEGATE_API 1
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
+#if PLATFORM(MAC)
 #define HAVE_AVPLAYER_VIDEORANGEOVERRIDE 1
 #endif
 
@@ -605,7 +588,7 @@
 #define HAVE_MULTIGAMEPADPROVIDER_SUPPORT 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_GCEXTENDEDGAMEPAD_HOME_BUTTON 1
 #endif
 
@@ -613,15 +596,15 @@
 #define HAVE_GCCONTROLLER_HID_DEVICE_CHECK 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC)
 #define HAVE_INCREMENTAL_PDF_APIS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC)
 #define HAVE_ALTERNATE_ICONS 1
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
+#if PLATFORM(MAC)
 #define HAVE_LARGE_CONTROL_SIZE 1
 #endif
 
@@ -629,10 +612,7 @@
 #define HAVE_UICONTEXTMENU_LOCATION 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_SYSTEM_FEATURE_FLAGS 1
 #endif
 
@@ -645,7 +625,7 @@
 #define HAVE_CANCEL_WEB_TOUCH_EVENTS_GESTURE 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC)
 #define HAVE_DD_HIGHLIGHT_CREATE_WITH_SCALE 1
 #endif
 
@@ -657,11 +637,11 @@
 #define HAVE_IOS_JIT_RESTRICTIONS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC)
 #define HAVE_AVAUDIO_ROUTING_ARBITER 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
 #define HAVE_MEDIA_USAGE_FRAMEWORK 1
 #endif
 
@@ -669,11 +649,11 @@
 #define HAVE_PASSKIT_INSTALLMENTS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS)
 #define HAVE_PASSKIT_NEW_BUTTON_TYPES 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(IOS)
 #define HAVE_PASSKIT_RECURRING_SUMMARY_ITEM 1
 #define HAVE_PASSKIT_DEFERRED_SUMMARY_ITEM 1
 #define HAVE_PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE 1
@@ -694,11 +674,11 @@
 #define HAVE_QUICKLOOK_THUMBNAILING 1
 #endif
 
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(IOS) || PLATFORM(MAC)
 #define HAVE_DISPLAY_LAYER_BIPLANAR_SUPPORT 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_LOGGING_PRIVACY_LEVEL 1
 #endif
 
@@ -706,19 +686,19 @@
 #define HAVE_FRONTBOARD_SYSTEM_APP_SERVICES 1
 #endif
 
-#if OS(DARWIN) && CPU(X86_64) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000))
+#if OS(DARWIN) && CPU(X86_64) && (PLATFORM(MAC) || PLATFORM(MACCATALYST))
 #define HAVE_CPU_TRANSLATION_CAPABILITY 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(GTK)
+#if PLATFORM(MAC) || PLATFORM(GTK)
 #define HAVE_APP_ACCENT_COLORS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC)
 #define HAVE_AVROUTEPICKERVIEW 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(MAC)
 #define HAVE_NSTABLEVIEWSTYLE 1
 #endif
 
@@ -726,16 +706,11 @@
 #define HAVE_AUDIO_OUTPUT_DEVICE_UNIQUE_ID 1
 #endif
 
-#if ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(IOS_FAMILY)
 #define HAVE_UIKEYBOARDIMPL_SMARTINSERTDELETE_CLASS_METHOD 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_CF_PREFS_SET_READ_ONLY 1
 #define HAVE_CFNETWORK_CNAME_AND_COOKIE_TRANSFORM_SPI 1
 #define HAVE_CGIMAGESOURCE_WITH_ACCURATE_LOOP_COUNT 1
@@ -747,36 +722,24 @@
 #define HAVE_IMAGEIO_FIX_FOR_RADAR_59589723 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_CTFONTISSYSTEMUIFONT 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_CTFONTDESCRIPTOR_CREATE_WITH_TEXT_STYLE_AND_ATTRIBUTES 1
 #endif
 
-#if ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+#if PLATFORM(IOS_FAMILY)
 #define HAVE_RUNNINGBOARD_WEBKIT_PRIORITY_SUPPORT 1
 #endif
 
-// FIXME: This should include PLATFORM(MACCATALYST) but our internal bots have not updated enough yet.
-// Try again when they do.  See rdar://problem/73940814
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_UI_EVENT_ATTRIBUTION 1
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || PLATFORM(IOS_FAMILY)
 #define HAVE_NETWORK_LOADER 1
 #define HAVE_SEC_TRUST_COPY_CERTIFICATE_CHAIN 1
 #define HAVE_OS_LAUNCHD_JOB 1
@@ -795,7 +758,7 @@
 #define HAVE_STYLUS_DEVICE_OBSERVATION 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000 || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(IOS) || PLATFORM(MAC)
 #if !defined(HAVE_APPLE_ATTESTATION)
 #define HAVE_APPLE_ATTESTATION 1
 #endif
@@ -807,7 +770,7 @@
 #endif
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(IOS) || PLATFORM(MAC)
 #if !defined(HAVE_TCC_IOS_14_BIG_SUR_SPI)
 #define HAVE_TCC_IOS_14_BIG_SUR_SPI 1
 #endif
@@ -835,10 +798,7 @@
 #define HAVE_CNCONTACTPICKERVIEWCONTROLLER 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_AVOUTPUTDEVICE_SPATIALAUDIO 1
 #endif
 
@@ -854,7 +814,7 @@
 #define HAVE_SANDBOX_MESSAGE_FILTERING 1
 #endif
 
-#if (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MAC)
 #define HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES 1
 #endif
 
@@ -890,8 +850,7 @@
 #define HAVE_AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #if !defined(HAVE_CORE_ANIMATION_SEPARATED_LAYERS)
 #define HAVE_CORE_ANIMATION_SEPARATED_LAYERS 1
 #define HAVE_CORE_ANIMATION_SEPARATED_PORTALS 1
@@ -899,14 +858,9 @@
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || PLATFORM(IOS_FAMILY)
 #define HAVE_LEVEL_3_SYSTEM_FONT_WIDTH_VALUES 1
-#elif (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#else
 #define HAVE_LEVEL_2_SYSTEM_FONT_WIDTH_VALUES 1
 #endif
 
@@ -925,19 +879,12 @@
 #define HAVE_PUIC_BUTTON_TYPE_PILL 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000 \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000))
+#if PLATFORM(COCOA)
 #define HAVE_CORE_GRAPHICS_CREATE_EXTENDED_COLOR_SPACE 1
 #define HAVE_CORE_GRAPHICS_EXTENDED_ADOBE_RGB_1998_COLOR_SPACE 1
 #define HAVE_CORE_GRAPHICS_EXTENDED_DISPLAY_P3_COLOR_SPACE 1
 #define HAVE_CORE_GRAPHICS_EXTENDED_ITUR_2020_COLOR_SPACE 1
 #define HAVE_CORE_GRAPHICS_EXTENDED_ROMMRGB_COLOR_SPACE 1
-#endif
-
-#if PLATFORM(COCOA)
 #define HAVE_CORE_GRAPHICS_ADOBE_RGB_1998_COLOR_SPACE 1
 #define HAVE_CORE_GRAPHICS_DISPLAY_P3_COLOR_SPACE 1
 #define HAVE_CORE_GRAPHICS_EXTENDED_LINEAR_SRGB_COLOR_SPACE 1
@@ -956,7 +903,8 @@
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+    || PLATFORM(IOS)
+// FIXME: Does this intend to exclude macCatalyst?
 #define HAVE_RSA_BSSA 1
 #endif
 
@@ -990,17 +938,12 @@
 #define HAVE_RSA_PSS_OID 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600) \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(COCOA)
 #define HAVE_VIDEO_RESTRICTED_DECODING 1
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || PLATFORM(IOS_FAMILY)
 #define HAVE_CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER 1
 #define HAVE_CFNETWORK_NSURLSESSION_HSTS_WITH_UNTRUSTED_ROOT 1
 #define HAVE_NSURLSESSION_TASK_DELEGATE 1
@@ -1009,17 +952,17 @@
 #define HAVE_XPC_CONNECTION_COPY_INVALIDATION_REASON 1
 #endif
 
-#if (PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
+#if (PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)) \
+    || PLATFORM(MACCATALYST) \
     || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
 #define HAVE_ASV_INLINE_PREVIEW 1
 #endif
 
-#if PLATFORM(IOS) || PLATFORM(MACCATALYST) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(MAC)
 #define HAVE_NSURLPROTOCOL_WITH_SKIPAPPSSO 1
 #endif
 
-#if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_UICONTEXTMENU_STYLE_CUSTOM_PRESENTATION 1
 #define HAVE_UIDATEPICKER_INSETS 1
 #define HAVE_UIDATEPICKER_OVERLAY_PRESENTATION 1
@@ -1026,8 +969,8 @@
 #define HAVE_UIMENUOPTIONS_SINGLE_SELECTION 1
 #endif
 
-#if (((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000))
+#if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) \
+    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
 #define HAVE_UPDATE_WEB_ACCESSIBILITY_SETTINGS 1
 #endif
 
@@ -1035,32 +978,28 @@
 #define HAVE_UIBLUREFFECT_STYLE_SYSTEM_MATERIAL 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000 \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000))
+#if PLATFORM(COCOA)
 #define HAVE_CORE_TEXT_SBIX_IMAGE_SIZE_FUNCTIONS 1
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+    || (PLATFORM(IOS) || PLATFORM(MACCATALYST))
 #if !defined(HAVE_VK_IMAGE_ANALYSIS)
 #define HAVE_VK_IMAGE_ANALYSIS 1
 #endif
 #endif
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#if PLATFORM(IOS)
 #if !defined(HAVE_VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES)
 #define HAVE_VK_IMAGE_ANALYSIS_FOR_MACHINE_READABLE_CODES 1
 #endif
 #endif
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#if PLATFORM(IOS)
 #define HAVE_PER_APP_ACCESSIBILITY_PREFERENCES 1
 #endif
 
-#if (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST) || PLATFORM(MAC)
 #define HAVE_PAC_SHARED_REGION_ID 1
 #endif
 
@@ -1099,14 +1038,12 @@
 #define HAVE_AVSAMPLEBUFFERRENDERSYNCHRONIZER_RATEATHOSTTIME 1
 #endif
 
-#if (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#if PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)
 #define HAVE_SYSTEM_STATUS 1
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR))
 #define HAVE_CORE_ANIMATION_FIX_FOR_RADAR_78402035 1
 #endif
 
@@ -1116,7 +1053,7 @@
 #endif
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_AVSAMPLEBUFFERVIDEOOUTPUT 1
 #endif
 
@@ -1128,9 +1065,7 @@
 #endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
-    || (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
-    || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \
-    || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED >= 150000)
+    || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR))
 #define HAVE_CVBUFFERCOPYATTACHMENTS 1
 #endif
 
@@ -1153,7 +1088,7 @@
 #define HAVE_CORE_LOCATION_WEBSITE_IDENTIFIERS 1
 #endif
 
-#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600)
+#if PLATFORM(COCOA)
 #define HAVE_CORE_LOCATION 1
 // kCLAuthorizationStatusAuthorizedWhenInUse is only available on macOS as part of the internal SDK.
 #if PLATFORM(IOS_FAMILY) || (defined __has_include && __has_include(<CoreFoundation/CFPriv.h>))
@@ -1173,7 +1108,7 @@
 #define HAVE_UNIFIED_SPEECHSYNTHESIS_FIX_FOR_81465164 1
 #endif
 
-#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(COCOA)
 #define HAVE_UNIFORM_TYPE_IDENTIFIERS_FRAMEWORK 1
 #endif
 
@@ -1193,7 +1128,8 @@
 #endif
 
 #if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
-    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000))
+    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) \
+    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000))
 #define HAVE_SANDBOX_STATE_FLAGS 1
 #endif

Modified: trunk/Source/WebCore/PAL/ChangeLog (292274 => 292275)


--- trunk/Source/WebCore/PAL/ChangeLog	2022-04-03 05:39:31 UTC (rev 292274)
+++ trunk/Source/WebCore/PAL/ChangeLog	2022-04-03 08:04:07 UTC (rev 292275)
@@ -1,3 +1,12 @@
+2022-04-03  Tim Horton  <timothy_hor...@apple.com>
+
+        _WKDataTask doesn't work in macCatalyst
+        https://bugs.webkit.org/show_bug.cgi?id=238655
+
+        Reviewed by Alexey Proskuryakov.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+
 2022-03-31  Wenson Hsieh  <wenson_hs...@apple.com>
 
         [iOS] Add support for temporarily installing VKCImageAnalysisInteraction on WKContentView

Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (292274 => 292275)


--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2022-04-03 05:39:31 UTC (rev 292274)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2022-04-03 08:04:07 UTC (rev 292275)
@@ -474,18 +474,6 @@
 - (void)_setCookiesRemovedHandler:(void(^__nullable)(NSArray<NSHTTPCookie*>* __nullable removedCookies, NSString* __nullable domainForRemovedCookies, bool removeAllCookies))cookiesRemovedHandler onQueue:(dispatch_queue_t __nullable)queue;
 @end
 
-#if HAVE(BROKEN_DOWNLOAD_RESUME_UNLINK)
-@interface __NSCFLocalDownloadFile : NSObject
-@end
-@interface __NSCFLocalDownloadFile ()
-@property (readwrite, assign) BOOL skipUnlink;
-@end
-
-@interface NSURLSessionDownloadTask ()
-- (__NSCFLocalDownloadFile *)downloadFile;
-@end
-#endif
-
 @interface NSURLResponse ()
 - (void)_setMIMEType:(NSString *)type;
 @end

Modified: trunk/Source/WebKit/ChangeLog (292274 => 292275)


--- trunk/Source/WebKit/ChangeLog	2022-04-03 05:39:31 UTC (rev 292274)
+++ trunk/Source/WebKit/ChangeLog	2022-04-03 08:04:07 UTC (rev 292275)
@@ -1,3 +1,13 @@
+2022-04-03  Tim Horton  <timothy_hor...@apple.com>
+
+        _WKDataTask doesn't work in macCatalyst
+        https://bugs.webkit.org/show_bug.cgi?id=238655
+
+        Reviewed by Alexey Proskuryakov.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]): Deleted.
+
 2022-04-02  Simon Fraser  <simon.fra...@apple.com>
 
         Plumb the IOSurfacePool through to ImageBufferBackend creation via ImageBuffer::CreationContext

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (292274 => 292275)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2022-04-03 05:39:31 UTC (rev 292274)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2022-04-03 08:04:07 UTC (rev 292275)
@@ -1014,15 +1014,6 @@
     download->didReceiveData(bytesWritten, totalBytesWritten, totalBytesExpectedToWrite);
 }
 
-- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes
-{
-#if HAVE(BROKEN_DOWNLOAD_RESUME_UNLINK)
-    // This is to work around rdar://problem/63249830
-    if ([downloadTask respondsToSelector:@selector(downloadFile)] && [downloadTask.downloadFile respondsToSelector:@selector(setSkipUnlink:)])
-        downloadTask.downloadFile.skipUnlink = YES;
-#endif
-}
-
 - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
 {
     auto* networkDataTask = [self existingTask:dataTask];

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to