Title: [235520] trunk/Source/WebKit
- Revision
- 235520
- Author
- [email protected]
- Date
- 2018-08-30 13:01:46 -0700 (Thu, 30 Aug 2018)
Log Message
Fix the watchOS and tvOS build
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]):
(-[WKContentView invokeShareSheetWithResolution:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (235519 => 235520)
--- trunk/Source/WebKit/ChangeLog 2018-08-30 20:01:33 UTC (rev 235519)
+++ trunk/Source/WebKit/ChangeLog 2018-08-30 20:01:46 UTC (rev 235520)
@@ -1,3 +1,11 @@
+2018-08-30 Tim Horton <[email protected]>
+
+ Fix the watchOS and tvOS build
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView invokeShareSheetWithResolution:]):
+
2018-08-30 Eric Carlson <[email protected]>
Mock video devices should only support discrete sizes
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (235519 => 235520)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-08-30 20:01:33 UTC (rev 235519)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-08-30 20:01:46 UTC (rev 235520)
@@ -779,13 +779,15 @@
[_fileUploadPanel dismiss];
_fileUploadPanel = nil;
}
-
+
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
if (_shareSheet) {
[_shareSheet setDelegate:nil];
[_shareSheet dismiss];
_shareSheet = nil;
}
-
+#endif
+
_inputViewUpdateDeferrer = nullptr;
_assistedNodeInformation = { };
@@ -5889,7 +5891,9 @@
- (void)invokeShareSheetWithResolution:(BOOL)resolved
{
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
[_shareSheet invokeShareSheetWithResolution:resolved];
+#endif
}
- (NSDictionary *)_contentsOfUserInterfaceItem:(NSString *)userInterfaceItem
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
