Title: [215826] tags/Safari-604.1.18.1/Source/WebKit2
- Revision
- 215826
- Author
- [email protected]
- Date
- 2017-04-26 13:23:57 -0700 (Wed, 26 Apr 2017)
Log Message
Cherry-pick 6259a37cc6ee5e811df5a2d8c043ef0c9a2929bd
358c01809a1fefdd4606930f09b5acc8b8a007ed. rdar://problem/31827095
Modified Paths
Diff
Modified: tags/Safari-604.1.18.1/Source/WebKit2/ChangeLog (215825 => 215826)
--- tags/Safari-604.1.18.1/Source/WebKit2/ChangeLog 2017-04-26 20:23:54 UTC (rev 215825)
+++ tags/Safari-604.1.18.1/Source/WebKit2/ChangeLog 2017-04-26 20:23:57 UTC (rev 215826)
@@ -1,5 +1,19 @@
2017-04-26 Jason Marcell <[email protected]>
+ Cherry-pick 6259a37cc6ee5e811df5a2d8c043ef0c9a2929bd
+358c01809a1fefdd4606930f09b5acc8b8a007ed. rdar://problem/31827095
+
+ 2017-04-25 Wenson Hsieh <[email protected]>
+
+ Unreviewed, speculative build fix
+
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+ For the time being, remove all references to UIItemProviders from this private header.
+ This should be fixed to use unavailability macros in a followup. See <rdar://problem/31827095>.
+
+2017-04-26 Jason Marcell <[email protected]>
+
Cherry-pick 9000840c460a566350f3532112bb13e684062b6f. rdar://problem/31634990
2017-04-20 Wenson Hsieh <[email protected]>
Modified: tags/Safari-604.1.18.1/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (215825 => 215826)
--- tags/Safari-604.1.18.1/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2017-04-26 20:23:54 UTC (rev 215825)
+++ tags/Safari-604.1.18.1/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2017-04-26 20:23:57 UTC (rev 215826)
@@ -32,7 +32,6 @@
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/_WKActivatedElementInfo.h>
-@class UIItemProvider;
@class UIScrollView;
@class UIViewController;
@class WKFrameInfo;
@@ -92,8 +91,8 @@
- (void)_webView:(WKWebView *)webView getAlternateURLFromImage:(UIImage *)image completionHandler:(void (^)(NSURL *alternateURL, NSDictionary *userInfo))completionHandler WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (NSURL *)_webView:(WKWebView *)webView alternateURLFromImage:(UIImage *)image userInfo:(NSDictionary **)userInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForImage:(UIImage *)image alternateURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
-- (NSArray<UIItemProvider *> *)_webView:(WKWebView *)webView adjustedDataInteractionItemProviders:(NSArray<UIItemProvider *> *)originalItemProviders WK_API_AVAILABLE(ios(WK_IOS_TBA));
-- (BOOL)_webView:(WKWebView *)webView performDataInteractionOperationWithItemProviders:(NSArray<UIItemProvider *> *)itemProviders WK_API_AVAILABLE(ios(WK_IOS_TBA));
+- (NSArray *)_webView:(WKWebView *)webView adjustedDataInteractionItemProviders:(NSArray *)originalItemProviders WK_API_AVAILABLE(ios(WK_IOS_TBA));
+- (BOOL)_webView:(WKWebView *)webView performDataInteractionOperationWithItemProviders:(NSArray *)itemProviders WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_webView:(WKWebView *)webView dataInteraction:(id)interaction sessionWillBegin:(id)session WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_webView:(WKWebView *)webView dataInteraction:(id)interaction session:(id)session didEndWithOperation:(NSUInteger)operation WK_API_AVAILABLE(ios(WK_IOS_TBA));
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
