Title: [293339] trunk/Source/WebKit
- Revision
- 293339
- Author
- akeer...@apple.com
- Date
- 2022-04-25 12:58:27 -0700 (Mon, 25 Apr 2022)
Log Message
Fix the tvOS and watchOS builds after r293231
https://bugs.webkit.org/show_bug.cgi?id=239736
rdar://92283605
Reviewed by Wenson Hsieh.
* UIProcess/API/Cocoa/WKWebView.h:
UIFindInteraction is marked unavailable on watchOS and tvOS.
* UIProcess/API/Cocoa/WKWebView.mm:
Use platform-checks rather than the existing HAVE macro, so that these
methods are still implemented in older builds. There are no version
checks in WKWebView.h.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (293338 => 293339)
--- trunk/Source/WebKit/ChangeLog 2022-04-25 19:54:13 UTC (rev 293338)
+++ trunk/Source/WebKit/ChangeLog 2022-04-25 19:58:27 UTC (rev 293339)
@@ -1,3 +1,21 @@
+2022-04-25 Aditya Keerthi <akeer...@apple.com>
+
+ Fix the tvOS and watchOS builds after r293231
+ https://bugs.webkit.org/show_bug.cgi?id=239736
+ rdar://92283605
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+
+ UIFindInteraction is marked unavailable on watchOS and tvOS.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+
+ Use platform-checks rather than the existing HAVE macro, so that these
+ methods are still implemented in older builds. There are no version
+ checks in WKWebView.h.
+
2022-04-25 Claudio Saavedra <csaave...@igalia.com>
[GLIB] Default-handle recently-added ProcessTerminationReason values
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (293338 => 293339)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2022-04-25 19:54:13 UTC (rev 293338)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2022-04-25 19:58:27 UTC (rev 293339)
@@ -33,7 +33,7 @@
NS_ASSUME_NONNULL_BEGIN
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
@class UIFindInteraction;
#endif
@@ -650,7 +650,7 @@
- (void)setMinimumViewportInset:(NSEdgeInsets)minimumViewportInset maximumViewportInset:(NSEdgeInsets)maximumViewportInset WK_API_AVAILABLE(macos(WK_MAC_TBA));
#endif
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
/*! @abstract Enables the web view's built-in find interaction. */
@property (nonatomic, readwrite, getter=isFindInteractionEnabled) BOOL findInteractionEnabled WK_API_AVAILABLE(ios(WK_IOS_TBA));
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (293338 => 293339)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-04-25 19:54:13 UTC (rev 293338)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-04-25 19:58:27 UTC (rev 293339)
@@ -1431,6 +1431,8 @@
return _scrollView.get();
}
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
- (BOOL)findInteractionEnabled
{
return _findInteractionEnabled;
@@ -1467,6 +1469,8 @@
#endif
}
+#endif // !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
#endif // PLATFORM(IOS_FAMILY)
#pragma mark - macOS API
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
