Diff
Modified: trunk/Source/WebKit/ChangeLog (245690 => 245691)
--- trunk/Source/WebKit/ChangeLog 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/ChangeLog 2019-05-23 17:20:54 UTC (rev 245691)
@@ -1,3 +1,27 @@
+2019-05-23 Alex Christensen <[email protected]>
+
+ Deprecate more preview API
+ https://bugs.webkit.org/show_bug.cgi?id=198152
+
+ Reviewed by Dean Jackson.
+
+ This is working towards <rdar://problem/51003503>
+
+ * UIProcess/API/Cocoa/WKPreviewActionItem.h:
+ * UIProcess/API/Cocoa/WKPreviewActionItem.mm:
+ * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h:
+ * UIProcess/API/Cocoa/WKPreviewActionItemInternal.h:
+ * UIProcess/API/Cocoa/WKPreviewElementInfo.h:
+ * UIProcess/API/Cocoa/WKPreviewElementInfo.mm:
+ * UIProcess/API/Cocoa/WKUIDelegate.h:
+ * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h:
+ (WebKit::ScrollingTreeScrollingNodeDelegateIOS::activeTouchActions const):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (previewIdentifierForElementAction):
+ (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+ (-[WKContentView _presentedViewControllerForPreviewItemController:]):
+ (-[WKContentView _previewItemController:commitPreview:]):
+
2019-05-23 Antoine Quint <[email protected]>
[tvOS] Build broken by r245639
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.h (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.h 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.h 2019-05-23 17:20:54 UTC (rev 245691)
@@ -29,7 +29,7 @@
#import <UIKit/UIViewController.h>
-WK_API_AVAILABLE(ios(10.0))
+WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA))
@protocol WKPreviewActionItem <UIPreviewActionItem>
@property (nonatomic, copy, readonly) NSString *identifier;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.mm (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.mm 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.mm 2019-05-23 17:20:54 UTC (rev 245691)
@@ -31,6 +31,7 @@
@implementation WKPreviewAction
@synthesize identifier=_identifier;
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+ (instancetype)actionWithIdentifier:(NSString *)identifier title:(NSString *)title style:(UIPreviewActionStyle)style handler:(void (^)(UIPreviewAction *action, UIViewController *previewViewController))handler
{
WKPreviewAction *action = "" actionWithTitle:title style:style handler:handler];
@@ -37,6 +38,7 @@
action->_identifier = identifier;
return action;
}
+ALLOW_DEPRECATED_DECLARATIONS_END
- (id)copyWithZone:(NSZone *)zone
{
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h 2019-05-23 17:20:54 UTC (rev 245691)
@@ -30,9 +30,9 @@
#import <Foundation/Foundation.h>
-WK_EXTERN NSString * const WKPreviewActionItemIdentifierOpen WK_API_AVAILABLE(ios(10.0));
-WK_EXTERN NSString * const WKPreviewActionItemIdentifierAddToReadingList WK_API_AVAILABLE(ios(10.0));
-WK_EXTERN NSString * const WKPreviewActionItemIdentifierCopy WK_API_AVAILABLE(ios(10.0));
-WK_EXTERN NSString * const WKPreviewActionItemIdentifierShare WK_API_AVAILABLE(ios(10.0));
+WK_EXTERN NSString * const WKPreviewActionItemIdentifierOpen WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
+WK_EXTERN NSString * const WKPreviewActionItemIdentifierAddToReadingList WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
+WK_EXTERN NSString * const WKPreviewActionItemIdentifierCopy WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
+WK_EXTERN NSString * const WKPreviewActionItemIdentifierShare WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemInternal.h (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemInternal.h 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemInternal.h 2019-05-23 17:20:54 UTC (rev 245691)
@@ -29,10 +29,12 @@
#import "WKPreviewActionItem.h"
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
@interface WKPreviewAction : UIPreviewAction <WKPreviewActionItem>
+ (instancetype)actionWithIdentifier:(NSString *)identifier title:(NSString *)title style:(UIPreviewActionStyle)style handler:(void (^)(UIPreviewAction *action, UIViewController *previewViewController))handler;
@end
+ALLOW_DEPRECATED_DECLARATIONS_END
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewElementInfo.mm (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewElementInfo.mm 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewElementInfo.mm 2019-05-23 17:20:54 UTC (rev 245691)
@@ -28,7 +28,9 @@
#if PLATFORM(IOS_FAMILY)
+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
@implementation WKPreviewElementInfo
+IGNORE_WARNINGS_END
- (instancetype)_initWithLinkURL:(NSURL *)url
{
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h 2019-05-23 17:20:54 UTC (rev 245691)
@@ -150,7 +150,7 @@
@param webView The web view invoking the delegate method.
@param previewingViewController The view controller that is being popped.
*/
-- (void)webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_API_AVAILABLE(ios(10.0));
+- (void)webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
#endif // TARGET_OS_IPHONE
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h 2019-05-23 17:20:54 UTC (rev 245691)
@@ -67,7 +67,7 @@
void repositionScrollingLayers();
#if ENABLE(POINTER_EVENTS)
- OptionSet<TouchAction> activeTouchActions() const { return m_activeTouchActions; }
+ OptionSet<WebCore::TouchAction> activeTouchActions() const { return m_activeTouchActions; }
void computeActiveTouchActionsForGestureRecognizer(UIGestureRecognizer*);
void clearActiveTouchActions() { m_activeTouchActions = { }; }
void cancelPointersForGestureRecognizer(UIGestureRecognizer*);
@@ -80,7 +80,7 @@
RetainPtr<CALayer> m_scrolledContentsLayer;
RetainPtr<WKScrollingNodeScrollViewDelegate> m_scrollViewDelegate;
#if ENABLE(POINTER_EVENTS)
- OptionSet<TouchAction> m_activeTouchActions { };
+ OptionSet<WebCore::TouchAction> m_activeTouchActions { };
#endif
bool m_updatingFromStateNode { false };
};
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (245690 => 245691)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-05-23 17:01:00 UTC (rev 245690)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-05-23 17:20:54 UTC (rev 245691)
@@ -7268,6 +7268,7 @@
static NSString *previewIdentifierForElementAction(_WKElementAction *action)
{
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
switch (action.type) {
case _WKElementActionTypeOpen:
return WKPreviewActionItemIdentifierOpen;
@@ -7282,6 +7283,7 @@
default:
return nil;
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
ASSERT_NOT_REACHED();
return nil;
}
@@ -7333,12 +7335,12 @@
const URL& linkURL = _positionInformation.url;
if (_positionInformation.isLink) {
id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if ([uiDelegate respondsToSelector:@selector(webView:shouldPreviewElement:)]) {
auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:(NSURL *)linkURL]);
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return [uiDelegate webView:_webView shouldPreviewElement:previewElementInfo.get()];
-ALLOW_DEPRECATED_DECLARATIONS_END
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
if (linkURL.isEmpty())
return NO;
if (linkURL.protocolIsInHTTPFamily())
@@ -7485,11 +7487,11 @@
}];
[previewActions addObject:previewAction];
}
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:targetURL]);
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (UIViewController *controller = [uiDelegate webView:_webView previewingViewControllerForElement:previewElementInfo.get() defaultActions:previewActions.get()])
return controller;
-ALLOW_DEPRECATED_DECLARATIONS_END
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:defaultActions:elementInfo:)])
@@ -7548,7 +7550,9 @@
}
if ([uiDelegate respondsToSelector:@selector(webView:commitPreviewingViewController:)]) {
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[uiDelegate webView:_webView commitPreviewingViewController:viewController];
+ ALLOW_DEPRECATED_DECLARATIONS_END
return;
}
