Fix the watchOS and tvOS build
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Aug 2018 20:01:46 +0000 (20:01 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Aug 2018 20:01:46 +0000 (20:01 +0000)
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]):
(-[WKContentView invokeShareSheetWithResolution:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235520 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

index 9688a9a..e16d7b6 100644 (file)
@@ -1,3 +1,11 @@
+2018-08-30  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the watchOS and tvOS build
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView cleanupInteraction]):
+        (-[WKContentView invokeShareSheetWithResolution:]):
+
 2018-08-30  Eric Carlson  <eric.carlson@apple.com>
 
         Mock video devices should only support discrete sizes
index 139a717..bf54e39 100644 (file)
@@ -779,13 +779,15 @@ static inline bool hasAssistedNode(WebKit::AssistedNodeInformation assistedNodeI
         [_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 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
 
 - (void)invokeShareSheetWithResolution:(BOOL)resolved
 {
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     [_shareSheet invokeShareSheetWithResolution:resolved];
+#endif
 }
 
 - (NSDictionary *)_contentsOfUserInterfaceItem:(NSString *)userInterfaceItem