Title: [219225] trunk/Source/WebKit2
- Revision
- 219225
- Author
- wenson_hs...@apple.com
- Date
- 2017-07-06 16:59:08 -0700 (Thu, 06 Jul 2017)
Log Message
Unreviewed, fix the internal iOS 11 build
It turns out, our internal bots are still on an older version of the iOS 11 SDK that's missing _UIDataOwner in
<UIKit/NSItemProvider+UIKitAdditions_Private.h>. To ensure that we can build on both current and slightly older
versions of the iOS 11 SDK, fall back to using NSInteger instead of _UIDataOwner.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dragInteraction:dataOwnerForSession:]):
(-[WKContentView _dropInteraction:dataOwnerForSession:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (219224 => 219225)
--- trunk/Source/WebKit2/ChangeLog 2017-07-06 23:30:10 UTC (rev 219224)
+++ trunk/Source/WebKit2/ChangeLog 2017-07-06 23:59:08 UTC (rev 219225)
@@ -1,5 +1,18 @@
2017-07-06 Wenson Hsieh <wenson_hs...@apple.com>
+ Unreviewed, fix the internal iOS 11 build
+
+ It turns out, our internal bots are still on an older version of the iOS 11 SDK that's missing _UIDataOwner in
+ <UIKit/NSItemProvider+UIKitAdditions_Private.h>. To ensure that we can build on both current and slightly older
+ versions of the iOS 11 SDK, fall back to using NSInteger instead of _UIDataOwner.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dragInteraction:dataOwnerForSession:]):
+ (-[WKContentView _dropInteraction:dataOwnerForSession:]):
+
+2017-07-06 Wenson Hsieh <wenson_hs...@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>
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (219224 => 219225)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-07-06 23:30:10 UTC (rev 219224)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-07-06 23:59:08 UTC (rev 219225)
@@ -125,15 +125,6 @@
@end
#endif
-#if ENABLE(DRAG_SUPPORT)
-typedef NS_ENUM(NSInteger, _UIDataOwner) {
- _UIDataOwnerUndefined,
- _UIDataOwnerUser,
- _UIDataOwnerEnterprise,
- _UIDataOwnerShared,
-};
-#endif
-
@interface UIAlertController ()
- (void)_addActionWithTitle:(NSString *)title style:(UIAlertActionStyle)style handler:(void (^)(void))handler;
- (void)_addActionWithTitle:(NSString *)title style:(UIAlertActionStyle)style handler:(void (^)(void))handler shouldDismissHandler:(BOOL (^)(void))shouldDismissHandler;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (219224 => 219225)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-07-06 23:30:10 UTC (rev 219224)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-07-06 23:59:08 UTC (rev 219225)
@@ -4535,12 +4535,12 @@
return [competingGestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]];
}
-- (_UIDataOwner)_dragInteraction:(UIDragInteraction *)interaction dataOwnerForSession:(id <UIDragSession>)session
+- (NSInteger)_dragInteraction:(UIDragInteraction *)interaction dataOwnerForSession:(id <UIDragSession>)session
{
id <WKUIDelegatePrivate> uiDelegate = self.webViewUIDelegate;
- _UIDataOwner dataOwner = _UIDataOwnerUndefined;
+ NSInteger dataOwner = 0;
if ([uiDelegate respondsToSelector:@selector(_webView:dataOwnerForDragSession:)])
- dataOwner = (_UIDataOwner)[uiDelegate _webView:_webView dataOwnerForDragSession:session];
+ dataOwner = [uiDelegate _webView:_webView dataOwnerForDragSession:session];
return dataOwner;
}
@@ -4718,12 +4718,12 @@
#pragma mark - UIDropInteractionDelegate
-- (_UIDataOwner)_dropInteraction:(UIDropInteraction *)interaction dataOwnerForSession:(id <UIDropSession>)session
+- (NSInteger)_dropInteraction:(UIDropInteraction *)interaction dataOwnerForSession:(id <UIDropSession>)session
{
id <WKUIDelegatePrivate> uiDelegate = self.webViewUIDelegate;
- _UIDataOwner dataOwner = _UIDataOwnerUndefined;
+ NSInteger dataOwner = 0;
if ([uiDelegate respondsToSelector:@selector(_webView:dataOwnerForDropSession:)])
- dataOwner = (_UIDataOwner)[uiDelegate _webView:_webView dataOwnerForDropSession:session];
+ dataOwner = [uiDelegate _webView:_webView dataOwnerForDropSession:session];
return dataOwner;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
