Title: [273190] trunk/Source/WebKit
- Revision
- 273190
- Author
- wenson_hs...@apple.com
- Date
- 2021-02-19 19:46:08 -0800 (Fri, 19 Feb 2021)
Log Message
Unreviewed, fix some internal builds after r273184
Add a forward declaration for this (recently added) SPI, which we can safely revert once internal automation is
using an SDK with the fix for <rdar://problem/73852335>.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dataOwnerForPasteboard:]):
Additionally make this binary compatible with older versions of the system by adding a `-respondsToSelector:`
check before attempting to use the declared SPI.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (273189 => 273190)
--- trunk/Source/WebKit/ChangeLog 2021-02-20 03:06:00 UTC (rev 273189)
+++ trunk/Source/WebKit/ChangeLog 2021-02-20 03:46:08 UTC (rev 273190)
@@ -1,3 +1,17 @@
+2021-02-19 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix some internal builds after r273184
+
+ Add a forward declaration for this (recently added) SPI, which we can safely revert once internal automation is
+ using an SDK with the fix for <rdar://problem/73852335>.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dataOwnerForPasteboard:]):
+
+ Additionally make this binary compatible with older versions of the system by adding a `-respondsToSelector:`
+ check before attempting to use the declared SPI.
+
2021-02-19 Kate Cheney <katherine_che...@apple.com>
Add back old media playback API but deprecated
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (273189 => 273190)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-02-20 03:06:00 UTC (rev 273189)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-02-20 03:46:08 UTC (rev 273190)
@@ -1269,6 +1269,15 @@
#define UIWKDocumentRequestMarkedTextRects (1 << 5)
#define UIWKDocumentRequestSpatialAndCurrentSelection (1 << 6)
+#if HAVE(PASTEBOARD_DATA_OWNER)
+
+@interface UIResponder (Staging_73852335)
+@property (nonatomic, setter=_setDataOwnerForCopy:) _UIDataOwner _dataOwnerForCopy;
+@property (nonatomic, setter=_setDataOwnerForPaste:) _UIDataOwner _dataOwnerForPaste;
+@end
+
+#endif
+
@interface UITextInteractionAssistant (IPI)
@property (nonatomic, readonly) BOOL inGesture;
@property (nonatomic, readonly) UITextInteraction *interactions;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (273189 => 273190)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-02-20 03:06:00 UTC (rev 273189)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-02-20 03:46:08 UTC (rev 273190)
@@ -7488,6 +7488,11 @@
- (WebCore::DataOwnerType)_dataOwnerForPasteboard:(WebKit::PasteboardAccessIntent)intent
{
+ if (![self respondsToSelector:@selector(_dataOwnerForPaste)]) {
+ // FIXME: Remove this once the relevant bots have fix for <rdar://problem/73852335>.
+ return WebCore::DataOwnerType::Undefined;
+ }
+
if (intent == WebKit::PasteboardAccessIntent::Read)
return coreDataOwnerType(self._dataOwnerForPaste);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
