Title: [235530] trunk/Source/WebKit
- Revision
- 235530
- Author
- [email protected]
- Date
- 2018-08-30 16:10:51 -0700 (Thu, 30 Aug 2018)
Log Message
Try to fix the watchOS and tvOS build
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _showShareSheet:completionHandler:]):
(-[WKContentView shareSheetDidDismiss:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (235529 => 235530)
--- trunk/Source/WebKit/ChangeLog 2018-08-30 22:55:27 UTC (rev 235529)
+++ trunk/Source/WebKit/ChangeLog 2018-08-30 23:10:51 UTC (rev 235530)
@@ -1,3 +1,11 @@
+2018-08-30 Tim Horton <[email protected]>
+
+ Try to fix the watchOS and tvOS build
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _showShareSheet:completionHandler:]):
+ (-[WKContentView shareSheetDidDismiss:]):
+
2018-08-30 Justin Michaud <[email protected]>
[GTK] Touchscreen pinch to zoom should scale the page like other platforms
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (235529 => 235530)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-08-30 22:55:27 UTC (rev 235529)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-08-30 23:10:51 UTC (rev 235530)
@@ -4710,9 +4710,9 @@
_fileUploadPanel = nil;
}
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
- (void)_showShareSheet:(const ShareDataWithParsedURL&)data completionHandler:(CompletionHandler<void(bool)>&&)completionHandler
{
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
ASSERT(!_shareSheet);
if (_shareSheet)
return;
@@ -4721,16 +4721,18 @@
[_shareSheet setDelegate:self];
[_shareSheet presentWithParameters:data completionHandler:WTFMove(completionHandler)];
+#endif
}
- (void)shareSheetDidDismiss:(WKShareSheet *)shareSheet
{
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
ASSERT(_shareSheet == shareSheet);
[_shareSheet setDelegate:nil];
_shareSheet = nil;
+#endif
}
-#endif
#pragma mark - UITextInputMultiDocument
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
