Changeset 245691 in webkit


Ignore:
Timestamp:
May 23, 2019 10:20:54 AM (5 years ago)
Author:
achristensen@apple.com
Message:

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:]):

Location:
trunk/Source/WebKit
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r245679 r245691  
     12019-05-23  Alex Christensen  <achristensen@webkit.org>
     2
     3        Deprecate more preview API
     4        https://bugs.webkit.org/show_bug.cgi?id=198152
     5
     6        Reviewed by Dean Jackson.
     7
     8        This is working towards <rdar://problem/51003503>
     9
     10        * UIProcess/API/Cocoa/WKPreviewActionItem.h:
     11        * UIProcess/API/Cocoa/WKPreviewActionItem.mm:
     12        * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h:
     13        * UIProcess/API/Cocoa/WKPreviewActionItemInternal.h:
     14        * UIProcess/API/Cocoa/WKPreviewElementInfo.h:
     15        * UIProcess/API/Cocoa/WKPreviewElementInfo.mm:
     16        * UIProcess/API/Cocoa/WKUIDelegate.h:
     17        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h:
     18        (WebKit::ScrollingTreeScrollingNodeDelegateIOS::activeTouchActions const):
     19        * UIProcess/ios/WKContentViewInteraction.mm:
     20        (previewIdentifierForElementAction):
     21        (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
     22        (-[WKContentView _presentedViewControllerForPreviewItemController:]):
     23        (-[WKContentView _previewItemController:commitPreview:]):
     24
    1252019-05-23  Antoine Quint  <graouts@apple.com>
    226

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.h

    r242339 r245691  
    3030#import <UIKit/UIViewController.h>
    3131
    32 WK_API_AVAILABLE(ios(10.0))
     32WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA))
    3333@protocol WKPreviewActionItem <UIPreviewActionItem>
    3434

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.mm

    r242339 r245691  
    3232@synthesize identifier=_identifier;
    3333
     34ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    3435+ (instancetype)actionWithIdentifier:(NSString *)identifier title:(NSString *)title style:(UIPreviewActionStyle)style handler:(void (^)(UIPreviewAction *action, UIViewController *previewViewController))handler
    3536{
    … …  
    3839    return action;
    3940}
     41ALLOW_DEPRECATED_DECLARATIONS_END
    4042
    4143- (id)copyWithZone:(NSZone *)zone

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h

    r242339 r245691  
    3131#import <Foundation/Foundation.h>
    3232
    33 WK_EXTERN NSString * const WKPreviewActionItemIdentifierOpen WK_API_AVAILABLE(ios(10.0));
    34 WK_EXTERN NSString * const WKPreviewActionItemIdentifierAddToReadingList WK_API_AVAILABLE(ios(10.0));
    35 WK_EXTERN NSString * const WKPreviewActionItemIdentifierCopy WK_API_AVAILABLE(ios(10.0));
    36 WK_EXTERN NSString * const WKPreviewActionItemIdentifierShare WK_API_AVAILABLE(ios(10.0));
     33WK_EXTERN NSString * const WKPreviewActionItemIdentifierOpen WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
     34WK_EXTERN NSString * const WKPreviewActionItemIdentifierAddToReadingList WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
     35WK_EXTERN NSString * const WKPreviewActionItemIdentifierCopy WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
     36WK_EXTERN NSString * const WKPreviewActionItemIdentifierShare WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
    3737
    3838#endif

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemInternal.h

    r242339 r245691  
    3030#import "WKPreviewActionItem.h"
    3131
     32ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    3233@interface WKPreviewAction : UIPreviewAction <WKPreviewActionItem>
    3334
    … …  
    3536
    3637@end
     38ALLOW_DEPRECATED_DECLARATIONS_END
    3739
    3840#endif

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewElementInfo.mm

    r242339 r245691  
    2929#if PLATFORM(IOS_FAMILY)
    3030
     31IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    3132@implementation WKPreviewElementInfo
     33IGNORE_WARNINGS_END
    3234
    3335- (instancetype)_initWithLinkURL:(NSURL *)url

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h

    r245597 r245691  
    151151 @param previewingViewController The view controller that is being popped.
    152152 */
    153 - (void)webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_API_AVAILABLE(ios(10.0));
     153- (void)webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
    154154
    155155#endif // TARGET_OS_IPHONE

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h

    r245568 r245691  
    6868
    6969#if ENABLE(POINTER_EVENTS)
    70     OptionSet<TouchAction> activeTouchActions() const { return m_activeTouchActions; }
     70    OptionSet<WebCore::TouchAction> activeTouchActions() const { return m_activeTouchActions; }
    7171    void computeActiveTouchActionsForGestureRecognizer(UIGestureRecognizer*);
    7272    void clearActiveTouchActions() { m_activeTouchActions = { }; }
    … …  
    8181    RetainPtr<WKScrollingNodeScrollViewDelegate> m_scrollViewDelegate;
    8282#if ENABLE(POINTER_EVENTS)
    83     OptionSet<TouchAction> m_activeTouchActions { };
     83    OptionSet<WebCore::TouchAction> m_activeTouchActions { };
    8484#endif
    8585    bool m_updatingFromStateNode { false };

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

    r245661 r245691  
    72697269static NSString *previewIdentifierForElementAction(_WKElementAction *action)
    72707270{
     7271    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    72717272    switch (action.type) {
    72727273    case _WKElementActionTypeOpen:
    … …  
    72837284        return nil;
    72847285    }
     7286    ALLOW_DEPRECATED_DECLARATIONS_END
    72857287    ASSERT_NOT_REACHED();
    72867288    return nil;
    … …  
    73347336    if (_positionInformation.isLink) {
    73357337        id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
     7338        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    73367339        if ([uiDelegate respondsToSelector:@selector(webView:shouldPreviewElement:)]) {
    73377340            auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:(NSURL *)linkURL]);
    7338 ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    73397341            return [uiDelegate webView:_webView shouldPreviewElement:previewElementInfo.get()];
    7340 ALLOW_DEPRECATED_DECLARATIONS_END
    73417342        }
     7343        ALLOW_DEPRECATED_DECLARATIONS_END
    73427344        if (linkURL.isEmpty())
    73437345            return NO;
    … …  
    74867488                [previewActions addObject:previewAction];
    74877489            }
     7490            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    74887491            auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:targetURL]);
    7489 ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    74907492            if (UIViewController *controller = [uiDelegate webView:_webView previewingViewControllerForElement:previewElementInfo.get() defaultActions:previewActions.get()])
    74917493                return controller;
    7492 ALLOW_DEPRECATED_DECLARATIONS_END
     7494            ALLOW_DEPRECATED_DECLARATIONS_END
    74937495        }
    74947496
    … …  
    75497551
    75507552    if ([uiDelegate respondsToSelector:@selector(webView:commitPreviewingViewController:)]) {
     7553        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    75517554        [uiDelegate webView:_webView commitPreviewingViewController:viewController];
     7555        ALLOW_DEPRECATED_DECLARATIONS_END
    75527556        return;
    75537557    }
Note: See TracChangeset for help on using the changeset viewer.