Title: [261656] trunk/Source/WebKit
- Revision
- 261656
- Author
- [email protected]
- Date
- 2020-05-13 14:37:19 -0700 (Wed, 13 May 2020)
Log Message
Unreviewed, fix tvOS and watchOS builds after r261638
`-[UIPasteboard itemProviders]` is not present on watchOS and tvOS.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _writePromisedAttachmentToPasteboard:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (261655 => 261656)
--- trunk/Source/WebKit/ChangeLog 2020-05-13 21:23:15 UTC (rev 261655)
+++ trunk/Source/WebKit/ChangeLog 2020-05-13 21:37:19 UTC (rev 261656)
@@ -1,3 +1,12 @@
+2020-05-13 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix tvOS and watchOS builds after r261638
+
+ `-[UIPasteboard itemProviders]` is not present on watchOS and tvOS.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _writePromisedAttachmentToPasteboard:]):
+
2020-05-13 Timothy Horton <[email protected]>
Build fix.
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (261655 => 261656)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-13 21:23:15 UTC (rev 261655)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-13 21:37:19 UTC (rev 261656)
@@ -8613,6 +8613,8 @@
#if ENABLE(ATTACHMENT_ELEMENT)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
static RetainPtr<NSItemProvider> createItemProvider(const WebKit::WebPageProxy& page, const WebCore::PromisedAttachmentInfo& info)
{
auto numberOfAdditionalTypes = info.additionalTypes.size();
@@ -8658,10 +8660,16 @@
return item;
}
+#endif // !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
- (void)_writePromisedAttachmentToPasteboard:(WebCore::PromisedAttachmentInfo&&)info
{
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
if (auto item = createItemProvider(*_page, WTFMove(info)))
UIPasteboard.generalPasteboard.itemProviders = @[ item.get() ];
+#else
+ UNUSED_PARAM(info);
+#endif
}
#endif // ENABLE(ATTACHMENT_ELEMENT)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
