Skip to content

Commit 832f484

Browse files
UInt2048UInt2048
committed
Compile for iOS 16
1 parent 6b80219 commit 832f484

13 files changed

Lines changed: 104 additions & 54 deletions

File tree

‎Source/WTF/wtf/PlatformEnableCocoa.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@
967967
#define ENABLE_WEBM_FORMAT_READER 1
968968
#endif
969969

970-
#if !defined(ENABLE_WEBPROCESS_CACHE) && (PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400))
970+
#if !defined(ENABLE_WEBPROCESS_CACHE) && (PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400))
971971
#define ENABLE_WEBPROCESS_CACHE 1
972972
#endif
973973

@@ -1021,7 +1021,7 @@
10211021
#endif
10221022

10231023
#if !defined(ENABLE_AV1) \
1024-
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 130300) \
1024+
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130300) \
10251025
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
10261026
|| PLATFORM(VISION))
10271027
#define ENABLE_AV1 1

‎Source/WTF/wtf/PlatformHave.h‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,8 @@
748748
#endif
749749

750750
#if !defined(HAVE_UI_TEXT_SELECTION_DISPLAY_INTERACTION) \
751-
&& (PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(VISION) || PLATFORM(APPLETV))
751+
&& (((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
752+
|| PLATFORM(VISION) || PLATFORM(APPLETV))
752753
#define HAVE_UI_TEXT_SELECTION_DISPLAY_INTERACTION 1
753754
#endif
754755

@@ -860,9 +861,9 @@
860861
#endif
861862

862863
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
863-
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160100) \
864-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 160100) \
865-
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 90100) \
864+
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160100) \
865+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 160100) \
866+
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 90100) \
866867
|| PLATFORM(VISION)
867868
#define HAVE_AVCONTENTKEYREQUEST_COMPATABILITIY_MODE 1
868869
#endif
@@ -982,8 +983,8 @@
982983
#endif
983984

984985
#if !defined(HAVE_VK_IMAGE_ANALYSIS_TYPE_IMAGE_SEGMENTATION) \
985-
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000) \
986-
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160400)) \
986+
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
987+
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160400)) \
987988
|| PLATFORM(VISION)
988989
#define HAVE_VK_IMAGE_ANALYSIS_TYPE_IMAGE_SEGMENTATION 1
989990
#endif
@@ -1386,10 +1387,10 @@
13861387
#define HAVE_SETUSEIOSURFACEFORTILES 1
13871388
#endif
13881389

1389-
#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) \
1390-
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000) \
1391-
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 100000) \
1392-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1390+
#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
1391+
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1392+
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
1393+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
13931394
|| PLATFORM(VISION))
13941395
#if __has_include(<Network/proxy_config.h>)
13951396
#define HAVE_NW_PROXY_CONFIG 1
@@ -1502,7 +1503,7 @@
15021503
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
15031504
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
15041505
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1505-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1506+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
15061507
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000)
15071508
#define HAVE_JPEGXL 1
15081509
#endif
@@ -1515,14 +1516,14 @@
15151516
#define HAVE_LS_SERVER_CONNECTION_STATUS_RELEASE_NOTIFICATIONS_MASK 1
15161517
#endif
15171518

1518-
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
1519+
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000
15191520
#define HAVE_NSVIEW_CLIPSTOBOUNDS_API 1
15201521
#endif
15211522

15221523
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
15231524
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
15241525
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1525-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1526+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
15261527
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
15271528
|| PLATFORM(VISION)
15281529
#define HAVE_CGIMAGESOURCE_DISABLE_HARDWARE_DECODING 1
@@ -1532,7 +1533,7 @@
15321533
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
15331534
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
15341535
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1535-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1536+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
15361537
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
15371538
|| PLATFORM(VISION)
15381539
#define HAVE_AVURLASSET_ISPLAYABLEEXTENDEDMIMETYPEWITHOPTIONS 1
@@ -1541,7 +1542,7 @@
15411542
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
15421543
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
15431544
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1544-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1545+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
15451546
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000)
15461547
#define HAVE_CTFONTCOPYCOLORGLYPHCOVERAGE 1
15471548
#endif
@@ -1556,7 +1557,7 @@
15561557

15571558
#if (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
15581559
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1559-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1560+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
15601561
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
15611562
|| PLATFORM(VISION)
15621563
#define HAVE_UI_USER_INTERFACE_IDIOM_VISION 1
@@ -1565,7 +1566,7 @@
15651566
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
15661567
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
15671568
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1568-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1569+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
15691570
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000)
15701571
#define HAVE_AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION 1
15711572
#endif
@@ -1631,7 +1632,11 @@
16311632
#endif
16321633

16331634
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
1634-
|| PLATFORM(MACCATALYST) || PLATFORM(IOS_FAMILY)
1635+
|| (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1636+
|| (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1637+
|| PLATFORM(VISION) \
1638+
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
1639+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000)
16351640
#define HAVE_CORE_CRYPTO_SIGNATURES_INT_RETURN_VALUE 1
16361641
#endif
16371642

@@ -1680,7 +1685,11 @@
16801685
#define HAVE_UISCROLLVIEW_ALLOWS_KEYBOARD_SCROLLING 1
16811686
#endif
16821687

1683-
#if !PLATFORM(APPLETV) && !PLATFORM(WATCHOS) && __has_include(<UIKit/UITextCursorDropPositionAnimator.h>)
1688+
#if __has_include(<UIKit/UITextCursorDropPositionAnimator.h>) && \
1689+
!defined(HAVE_UI_TEXT_CURSOR_DROP_POSITION_ANIMATOR) \
1690+
&& ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400) \
1691+
|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140400) \
1692+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170400))
16841693
#define HAVE_UI_TEXT_CURSOR_DROP_POSITION_ANIMATOR 1
16851694
#endif
16861695

@@ -1705,7 +1714,7 @@
17051714
#endif
17061715

17071716
#if !defined(HAVE_MARKETPLACE_KIT) \
1708-
&& (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400)
1717+
&& (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400)
17091718
#define HAVE_MARKETPLACE_KIT 1
17101719
#endif
17111720

@@ -1725,10 +1734,10 @@
17251734
#endif
17261735

17271736
#if !defined(HAVE_FAIRPLAYSTREAMING_MTPS_INITDATA) \
1728-
&& ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400) \
1729-
|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140400) \
1730-
|| (PLATFORM(VISION) && __VISION_OS_VERSION_MAX_ALLOWED >= 10100)) \
1731-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170400)
1737+
&& ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400) \
1738+
|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140400) \
1739+
|| (PLATFORM(VISION) && __VISION_OS_VERSION_MIN_REQUIRED >= 10100)) \
1740+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170400)
17321741
#define HAVE_FAIRPLAYSTREAMING_MTPS_INITDATA 1
17331742
#endif
17341743

@@ -1738,10 +1747,10 @@
17381747
#endif
17391748

17401749
#if !defined(HAVE_AVSAMPLEBUFFERVIDEORENDERER) \
1741-
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) \
1742-
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000) \
1743-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
1744-
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 100000) \
1750+
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
1751+
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
1752+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
1753+
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
17451754
|| PLATFORM(VISION))
17461755
#define HAVE_AVSAMPLEBUFFERVIDEORENDERER 1
17471756
#endif
@@ -1752,10 +1761,10 @@
17521761
#endif
17531762

17541763
#if !defined(HAVE_OBJC_CUSTOM_DEALLOC) \
1755-
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000) \
1756-
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000) \
1757-
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 160000) \
1758-
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 90000) \
1764+
&& ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
1765+
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) \
1766+
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 160000) \
1767+
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 90000) \
17591768
|| PLATFORM(VISION))
17601769
#define HAVE_OBJC_CUSTOM_DEALLOC 1
17611770
#endif
@@ -1778,15 +1787,15 @@
17781787
#endif
17791788

17801789
#if !defined(HAVE_ESIM_AUTOFILL_SYSTEM_SUPPORT) && \
1781-
(PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400)
1790+
(PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400)
17821791
#define HAVE_ESIM_AUTOFILL_SYSTEM_SUPPORT 1
17831792
#endif
17841793

1785-
#if !defined(HAVE_AUDIO_DEVICE_PROPERTY_REFERENCE_STREAM_ENABLED) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 150000
1794+
#if !defined(HAVE_AUDIO_DEVICE_PROPERTY_REFERENCE_STREAM_ENABLED) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 150000
17861795
#define HAVE_AUDIO_DEVICE_PROPERTY_REFERENCE_STREAM_ENABLED 1
17871796
#endif
17881797

1789-
#if !defined(HAVE_AUDIO_CONVERTER_SERVICE) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED > 140400
1798+
#if !defined(HAVE_AUDIO_CONVERTER_SERVICE) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 140400
17901799
#define HAVE_AUDIO_CONVERTER_SERVICE 1
17911800
#endif
17921801

‎Source/WTF/wtf/PlatformUse.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,11 +421,12 @@
421421
#define USE_SANDBOX_VERSION_3 1
422422
#endif
423423

424-
#if !defined(USE_EXTENSIONKIT) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400
424+
#if !defined(USE_EXTENSIONKIT) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400
425425
#define USE_EXTENSIONKIT 1
426426
#endif
427427

428-
#if !defined(USE_BROWSERENGINEKIT) && PLATFORM(IOS) && __has_include(<BrowserEngineKit/BETextInput.h>)
428+
#if !defined(USE_BROWSERENGINEKIT) && PLATFORM(IOS) && \
429+
__has_include(<BrowserEngineKit/BETextInput.h>) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170400
429430
#define USE_BROWSERENGINEKIT 1
430431
#endif
431432

‎Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,20 @@
5353
// to return a useful set of traits in cases where it has not been explicitly set. Ideally, this
5454
// method should also take in a base, full-specified trait collection from the view hierarchy, to be
5555
// used when building the new trait collection.
56+
#if !PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000
5657
RetainPtr combinedTraits = [m_savedTraitCollection traitCollectionByModifyingTraits:^(id<UIMutableTraits> traits) {
5758
traits.userInterfaceStyle = useDarkAppearance ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight;
5859
traits.userInterfaceLevel = useElevatedUserInterfaceLevel ? UIUserInterfaceLevelElevated : UIUserInterfaceLevelBase;
5960
}];
6061

6162
[PAL::getUITraitCollectionClass() setCurrentTraitCollection:traitCollectionWithAdjustedIdiomForSystemColors(combinedTraits.get())];
63+
#else
64+
auto userInterfaceStyleTrait = [PAL::getUITraitCollectionClass() traitCollectionWithUserInterfaceStyle:useDarkAppearance ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight];
65+
auto backgroundLevelTrait = [PAL::getUITraitCollectionClass() traitCollectionWithUserInterfaceLevel:useElevatedUserInterfaceLevel ? UIUserInterfaceLevelElevated : UIUserInterfaceLevelBase];
66+
auto newTraitCollection = traitCollectionWithAdjustedIdiomForSystemColors([PAL::getUITraitCollectionClass() traitCollectionWithTraitsFromCollections:@[ m_savedTraitCollection.get(), userInterfaceStyleTrait, backgroundLevelTrait ]]);
67+
68+
[PAL::getUITraitCollectionClass() setCurrentTraitCollection:newTraitCollection];
69+
#endif
6270
}
6371

6472
LocalCurrentTraitCollection::LocalCurrentTraitCollection(UITraitCollection *traitCollection)

‎Source/WebKit/Shared/AuxiliaryProcessExtensions/GPUProcessExtension.swift‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,20 @@ class GPUProcessExtension : WKProcessExtension {
3333
}
3434
}
3535

36-
extension GPUProcessExtension: RenderingExtension {
36+
extension GPUProcessExtension {
3737
func handle(xpcConnection: xpc_connection_t) {
3838
handleNewConnection(xpcConnection)
3939
}
4040

4141
override func lockdownSandbox(_ version: String) {
42-
if (version == "1.0") {
43-
self.applyRestrictedSandbox(revision: RestrictedSandboxRevision.revision1)
42+
if #available(iOSApplicationExtension 17.4, *) {
43+
if (version == "1.0") {
44+
self.applyRestrictedSandbox(revision: RestrictedSandboxRevision.revision1)
45+
}
4446
}
4547
}
4648

4749
}
50+
51+
@available(iOSApplicationExtension 17.4, *)
52+
extension GPUProcessExtension: RenderingExtension {}

‎Source/WebKit/Shared/AuxiliaryProcessExtensions/NetworkingProcessExtension.swift‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,20 @@ class NetworkingProcessExtension : WKProcessExtension {
3333
}
3434
}
3535

36-
extension NetworkingProcessExtension : NetworkingExtension {
36+
extension NetworkingProcessExtension {
3737
func handle(xpcConnection: xpc_connection_t) {
3838
handleNewConnection(xpcConnection)
3939
}
4040

4141
override func lockdownSandbox(_ version: String) {
42-
if (version == "1.0") {
43-
self.applyRestrictedSandbox(revision: RestrictedSandboxRevision.revision1)
42+
if #available(iOSApplicationExtension 17.4, *) {
43+
if (version == "1.0") {
44+
self.applyRestrictedSandbox(revision: RestrictedSandboxRevision.revision1)
45+
}
4446
}
4547
}
4648

4749
}
50+
51+
@available(iOSApplicationExtension 17.4, *)
52+
extension NetworkingProcessExtension : NetworkingExtension {}

‎Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.swift‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,19 @@ class WebContentProcessExtension : WKProcessExtension {
3434
}
3535

3636

37-
extension WebContentProcessExtension: WebContentExtension {
37+
extension WebContentProcessExtension {
3838
func handle(xpcConnection: xpc_connection_t) {
3939
handleNewConnection(xpcConnection)
4040
}
4141

4242
override func lockdownSandbox(_ version: String) {
43-
if (version == "1.0") {
44-
self.applyRestrictedSandbox(revision: RestrictedSandboxRevision.revision1)
43+
if #available(iOSApplicationExtension 17.4, *) {
44+
if (version == "1.0") {
45+
self.applyRestrictedSandbox(revision: RestrictedSandboxRevision.revision1)
46+
}
4547
}
4648
}
4749
}
50+
51+
@available(iOSApplicationExtension 17.4, *)
52+
extension WebContentProcessExtension: WebContentExtension {}

‎Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ WK_CLASS_AVAILABLE(macos(10.11), ios(9.0))
110110
*/
111111
+ (void)fetchAllDataStoreIdentifiers:(WK_SWIFT_UI_ACTOR void(^)(NSArray<NSUUID *> *))completionHandler WK_SWIFT_ASYNC_NAME(getter:allDataStoreIdentifiers()) WK_API_AVAILABLE(macos(14.0), ios(17.0));
112112

113-
#if ((TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) \
114-
|| ((TARGET_OS_IOS || TARGET_OS_MACCATALYST) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000) \
115-
|| (TARGET_OS_WATCH && __WATCH_OS_VERSION_MAX_ALLOWED >= 100000) \
116-
|| (TARGET_OS_TV && __TV_OS_VERSION_MAX_ALLOWED >= 170000) \
113+
#if ((TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000) \
114+
|| ((TARGET_OS_IOS || TARGET_OS_MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
115+
|| (TARGET_OS_WATCH && __WATCH_OS_VERSION_MIN_REQUIRED >= 100000) \
116+
|| (TARGET_OS_TV && __TV_OS_VERSION_MIN_REQUIRED >= 170000) \
117117
|| (defined(TARGET_OS_VISION) && TARGET_OS_VISION))
118118
/*! @abstract Gets or sets the proxy configurations to be used to override networking in all WKWebViews that use this WKWebsiteDataStore.
119119
@discussion Changing the proxy configurations might interupt current networking operations in any WKWebView that use this WKWebsiteDataStore,

‎Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,9 @@ void didExceedMemoryFootprintThreshold(size_t footprint, const String& domain, u
349349
};
350350

351351
@implementation WKWebsiteDataStore {
352+
#if HAVE(NW_PROXY_CONFIG)
352353
RetainPtr<NSArray> _proxyConfigurations;
354+
#endif
353355
}
354356

355357
WK_OBJECT_DISABLE_DISABLE_KVC_IVAR_ACCESS;

‎Source/WebKit/UIProcess/API/Cocoa/WebKitSwiftOverlay.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,23 @@ extension WKWebView {
5959
#if swift(>=5.5)
6060
@available(iOS 15.0, macOS 12.0, *)
6161
extension WKWebView {
62+
// Work around a compiler issue
63+
public static let WKPDFConfiguration_default = WKPDFConfiguration()
64+
public static let WKFindConfiguration_default = WKFindConfiguration()
65+
6266
public func callAsyncJavaScript(_ functionBody: String, arguments: [String:Any] = [:], in frame: WKFrameInfo? = nil, contentWorld: WKContentWorld) async throws -> Any? {
6367
return try await __callAsyncJavaScript(functionBody, arguments: arguments, inFrame: frame, in: contentWorld)
6468
}
6569

66-
public func pdf(configuration: WKPDFConfiguration = .init()) async throws -> Data {
70+
public func pdf(configuration: WKPDFConfiguration = WKPDFConfiguration_default) async throws -> Data {
6771
try await __createPDF(with: configuration)
6872
}
6973

7074
public func evaluateJavaScript(_ javaScript: String, in frame: WKFrameInfo? = nil, contentWorld: WKContentWorld) async throws -> Any? {
7175
try await __evaluateJavaScript(javaScript, inFrame: frame, in: contentWorld)
7276
}
7377

74-
public func find(_ string: String, configuration: WKFindConfiguration = .init()) async throws -> WKFindResult {
78+
public func find(_ string: String, configuration: WKFindConfiguration = WKFindConfiguration_default) async throws -> WKFindResult {
7579
await __find(string, with: configuration)
7680
}
7781
}

0 commit comments

Comments
 (0)