Skip to content

Commit 37282ba

Browse files
committed
Unreviewed, fix the Mac Catalyst build after 294063@main
https://bugs.webkit.org/show_bug.cgi?id=291990 rdar://149947098 Compile these new APIs out in Mac Catalyst, where requisite system support doesn't exist. * Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebView.h: Canonical link: https://commits.webkit.org/294072@main
1 parent e72e898 commit 37282ba

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,15 @@ WK_SWIFT_UI_ACTOR
294294
*/
295295
- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(WK_SWIFT_UI_ACTOR void (^)(NSArray<NSURL *> * _Nullable URLs))completionHandler WK_API_AVAILABLE(macos(10.12), ios(18.4), visionos(2.4));
296296

297-
#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
297+
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
298298

299299
/*! @abstract Tells the delegate when the keyboard delivers an input suggestion.
300300
@param webView The web view where the input suggestion should be inserted.
301301
@param inputSuggestion The input suggestion that the user or system selected.
302302
*/
303303
- (void)webView:(WKWebView *)webView insertInputSuggestion:(UIInputSuggestion *)inputSuggestion WK_API_AVAILABLE(ios(WK_IOS_TBA)) WK_API_UNAVAILABLE(tvos, watchos, visionos, macCatalyst) NS_SWIFT_NAME(webView(_:insertInputSuggestion:));
304304

305-
#endif // TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
305+
#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
306306

307307
@end
308308

Source/WebKit/UIProcess/API/Cocoa/WKWebView.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,15 +660,15 @@ The uniform type identifier kUTTypeWebArchive can be used get the related pasteb
660660

661661
#endif
662662

663-
#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
663+
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
664664

665665
/*! @abstract A reference to a conversation, such as a mail or messaging thread.
666666
@discussion Set this conversation context before the keyboard appears; the keyboard uses this context to initialize its conversation context value. When your conversation updates, update the smart reply by setting this property.
667667
*/
668668

669669
@property (strong, nonatomic) UIConversationContext *conversationContext WK_API_AVAILABLE(ios(WK_IOS_TBA)) WK_API_UNAVAILABLE(tvos, watchos, visionos, macCatalyst);
670670

671-
#endif // TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
671+
#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST && __IPHONE_OS_VERSION_MIN_REQUIRED >= 180400
672672

673673
/*!
674674
@abstract Controls whether this @link WKWebView @/link is inspectable in Web Inspector.

0 commit comments

Comments
 (0)