Changeset 219224 in webkit

Timestamp:

Jul 6, 2017 4:30:10 PM (7 years ago)

Author:

Wenson Hsieh

Message:

[iOS DnD] [WK2] Add delegate hooks for specifying the data owner for a drag or drop session
​https://bugs.webkit.org/show_bug.cgi?id=174139
<rdar://problem/33126212>

Reviewed by Beth Dakin.

Add hooks to query the UI delegate for a _UIDataOwner on both drag and drop sides.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _dragInteraction:dataOwnerForSession:]):
(-[WKContentView _dropInteraction:dataOwnerForSession:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (2 diffs)
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS DnD] [WK2] Add delegate hooks for specifying the data owner for a drag or drop session
+        https://bugs.webkit.org/show_bug.cgi?id=174139
+        <rdar://problem/33126212>
+
+        Reviewed by Beth Dakin.
+
+        Add hooks to query the UI delegate for a _UIDataOwner on both drag and drop sides.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _dragInteraction:dataOwnerForSession:]):
+        (-[WKContentView _dropInteraction:dataOwnerForSession:]):
+
 2017-07-06  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -82 +82 @@
 #endif
 
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
+#import <UIKit/NSItemProvider+UIKitAdditions_Private.h>
 #import <UIKit/UIItemProvider_Private.h>
 #endif
@@ -123 +124 @@
 @property (strong, nonatomic, readonly) UIGestureRecognizer *presentationSecondaryGestureRecognizer;
 @end
+#endif
+
+#if ENABLE(DRAG_SUPPORT)
+typedef NS_ENUM(NSInteger, _UIDataOwner) {
+    _UIDataOwnerUndefined,
+    _UIDataOwnerUser,
+    _UIDataOwnerEnterprise,
+    _UIDataOwnerShared,
+};
 #endif
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -115 +115 @@
 - (UITargetedDragPreview *)_webView:(WKWebView *)webView previewForCancellingItem:(UIDragItem *)item withDefault:(UITargetedDragPreview *)defaultPreview WK_API_AVAILABLE(ios(WK_IOS_TBA));
 - (NSArray<UIDragItem *> *)_webView:(WKWebView *)webView willPerformDropWithSession:(id <UIDropSession>)session WK_API_AVAILABLE(ios(WK_IOS_TBA));
+- (NSInteger)_webView:(WKWebView *)webView dataOwnerForDropSession:(id <UIDropSession>)session;
+- (NSInteger)_webView:(WKWebView *)webView dataOwnerForDragSession:(id <UIDragSession>)session;
 #endif
 - (void)_webView:(WKWebView *)webView didChangeSafeAreaShouldAffectObscuredInsets:(BOOL)safeAreaShouldAffectObscuredInsets WK_API_AVAILABLE(ios(WK_IOS_TBA));

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -4536 +4536 @@
 }
 
+- (_UIDataOwner)_dragInteraction:(UIDragInteraction *)interaction dataOwnerForSession:(id <UIDragSession>)session
+{
+    id <WKUIDelegatePrivate> uiDelegate = self.webViewUIDelegate;
+    _UIDataOwner dataOwner = _UIDataOwnerUndefined;
+    if ([uiDelegate respondsToSelector:@selector(_webView:dataOwnerForDragSession:)])
+        dataOwner = (_UIDataOwner)[uiDelegate _webView:_webView dataOwnerForDragSession:session];
+    return dataOwner;
+}
+
 - (void)_dragInteraction:(UIDragInteraction *)interaction prepareForSession:(id <UIDragSession>)session completion:(dispatch_block_t)completion
 {
@@ -4709 +4718 @@
 
 #pragma mark - UIDropInteractionDelegate
+
+- (_UIDataOwner)_dropInteraction:(UIDropInteraction *)interaction dataOwnerForSession:(id <UIDropSession>)session
+{
+    id <WKUIDelegatePrivate> uiDelegate = self.webViewUIDelegate;
+    _UIDataOwner dataOwner = _UIDataOwnerUndefined;
+    if ([uiDelegate respondsToSelector:@selector(_webView:dataOwnerForDropSession:)])
+        dataOwner = (_UIDataOwner)[uiDelegate _webView:_webView dataOwnerForDropSession:session];
+    return dataOwner;
+}
 
 - (BOOL)dropInteraction:(UIDropInteraction *)interaction canHandleSession:(id<UIDropSession>)session