⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 246137 in webkit


Ignore:
Timestamp:
Jun 5, 2019, 7:10:51 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Introduce new SPI for context menus on iOS
​https://bugs.webkit.org/show_bug.cgi?id=198590

Reviewed by Tim Horton.

Also introduce WKContextMenuElementInfo which is API.
This is part of <rdar://problem/51003503>

  • Shared/API/APIObject.h:
  • Shared/API/Cocoa/WebKit.h:
  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject):

  • Sources.txt:
  • SourcesCocoa.txt:
  • UIProcess/API/APIContextMenuElementInfo.cpp: Added.

(API::ContextMenuElementInfo::ContextMenuElementInfo):

  • UIProcess/API/APIContextMenuElementInfo.h: Added.
  • UIProcess/API/Cocoa/WKContextMenuElementInfo.h: Added.
  • UIProcess/API/Cocoa/WKContextMenuElementInfo.mm: Added.

(-[WKContextMenuElementInfo linkURL]):
(-[WKContextMenuElementInfo _apiObject]):
(-[WKContextMenuElementInfo _activatedElementInfo]):

  • UIProcess/API/Cocoa/WKContextMenuElementInfoInternal.h: Added.
  • UIProcess/API/Cocoa/WKContextMenuElementInfoPrivate.h: Added.
  • UIProcess/API/Cocoa/WKPreviewElementInfo.h:
  • UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
  • UIProcess/API/Cocoa/_WKActivatedElementInfo.h:
  • UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:

(-[_WKActivatedElementInfo _initWithInteractionInformationAtPosition:]):
(-[_WKActivatedElementInfo isAnimatedImage]):

  • UIProcess/ios/WKActionSheetAssistant.h:
  • UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
(-[WKActionSheetAssistant defaultActionsForImageSheet:]):

  • UIProcess/ios/WKContentView.h:
  • UIProcess/ios/WKContentViewInteraction.mm:
  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
6 added
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r246136 r246137  
     12019-06-05  Alex Christensen  <achristensen@webkit.org>
     2
     3        Introduce new SPI for context menus on iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=198590
     5
     6        Reviewed by Tim Horton.
     7
     8        Also introduce WKContextMenuElementInfo which is API.
     9        This is part of <rdar://problem/51003503>
     10
     11        * Shared/API/APIObject.h:
     12        * Shared/API/Cocoa/WebKit.h:
     13        * Shared/Cocoa/APIObject.mm:
     14        (API::Object::newObject):
     15        * Sources.txt:
     16        * SourcesCocoa.txt:
     17        * UIProcess/API/APIContextMenuElementInfo.cpp: Added.
     18        (API::ContextMenuElementInfo::ContextMenuElementInfo):
     19        * UIProcess/API/APIContextMenuElementInfo.h: Added.
     20        * UIProcess/API/Cocoa/WKContextMenuElementInfo.h: Added.
     21        * UIProcess/API/Cocoa/WKContextMenuElementInfo.mm: Added.
     22        (-[WKContextMenuElementInfo linkURL]):
     23        (-[WKContextMenuElementInfo _apiObject]):
     24        (-[WKContextMenuElementInfo _activatedElementInfo]):
     25        * UIProcess/API/Cocoa/WKContextMenuElementInfoInternal.h: Added.
     26        * UIProcess/API/Cocoa/WKContextMenuElementInfoPrivate.h: Added.
     27        * UIProcess/API/Cocoa/WKPreviewElementInfo.h:
     28        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
     29        * UIProcess/API/Cocoa/_WKActivatedElementInfo.h:
     30        * UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:
     31        (-[_WKActivatedElementInfo _initWithInteractionInformationAtPosition:]):
     32        (-[_WKActivatedElementInfo isAnimatedImage]):
     33        * UIProcess/ios/WKActionSheetAssistant.h:
     34        * UIProcess/ios/WKActionSheetAssistant.mm:
     35        (-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
     36        (-[WKActionSheetAssistant defaultActionsForImageSheet:]):
     37        * UIProcess/ios/WKContentView.h:
     38        * UIProcess/ios/WKContentViewInteraction.mm:
     39        * WebKit.xcodeproj/project.pbxproj:
     40
    1412019-06-05  Jer Noble  <jer.noble@apple.com>
    242

  • trunk/Source/WebKit/Shared/API/APIObject.h

    r245481 r246137  
    110110        ContentRuleListAction,
    111111        ContentRuleListStore,
     112#if PLATFORM(IOS_FAMILY)
     113        ContextMenuElementInfo,
     114#endif
    112115        ContextMenuListener,
    113116        CookieManager,

  • trunk/Source/WebKit/Shared/API/Cocoa/WebKit.h

    r243787 r246137  
    2828#import <WebKit/WKContentRuleList.h>
    2929#import <WebKit/WKContentRuleListStore.h>
     30#import <WebKit/WKContextMenuElementInfo.h>
    3031#import <WebKit/WKError.h>
    3132#import <WebKit/WKFoundation.h>

  • trunk/Source/WebKit/Shared/Cocoa/APIObject.mm

    r245481 r246137  
    3434#import "WKContentRuleListInternal.h"
    3535#import "WKContentRuleListStoreInternal.h"
     36#import "WKContextMenuElementInfoInternal.h"
    3637#import "WKFrameInfoInternal.h"
    3738#import "WKHTTPCookieStoreInternal.h"
    … …  
    314315        break;
    315316
     317#if PLATFORM(IOS_FAMILY)
     318    case Type::ContextMenuElementInfo:
     319        wrapper = [WKContextMenuElementInfo alloc];
     320        break;
     321#endif
     322
    316323    case Type::CustomHeaderFields:
    317324        wrapper = [_WKCustomHeaderFields alloc];

  • trunk/Source/WebKit/Sources.txt

    r245540 r246137  
    301301UIProcess/API/APIContentRuleListAction.cpp
    302302UIProcess/API/APIContentRuleListStore.cpp
     303UIProcess/API/APIContextMenuElementInfo.cpp
    303304UIProcess/API/APIExperimentalFeature.cpp
    304305UIProcess/API/APIFrameInfo.cpp

  • trunk/Source/WebKit/SourcesCocoa.txt

    r246048 r246137  
    285285UIProcess/API/Cocoa/WKContentRuleList.mm
    286286UIProcess/API/Cocoa/WKContentRuleListStore.mm
     287UIProcess/API/Cocoa/WKContextMenuElementInfo.mm
    287288UIProcess/API/Cocoa/WKError.mm
    288289UIProcess/API/Cocoa/WKFrameInfo.mm

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

    r242339 r246137  
    3232NS_ASSUME_NONNULL_BEGIN
    3333
    34 WK_CLASS_AVAILABLE(ios(10.0))
     34WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKContextMenuElementInfo", ios(10.0, WK_IOS_TBA))
    3535@interface WKPreviewElementInfo : NSObject <NSCopying>
    3636

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

    r245294 r246137  
    4141
    4242#if TARGET_OS_IOS
     43@class UIContextMenuConfiguration;
    4344@class UIDragItem;
    4445@class UITargetedDragPreview;
     46@class WKContextMenuElementInfo;
     47@protocol UIContextMenuInteractionCommitAnimating;
    4548@protocol UIDragSession;
    4649@protocol UIDropSession;
    … …  
    136139- (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
    137140- (void)_webView:(WKWebView *)webView requestGeolocationAuthorizationForURL:(NSURL *)url frame:(WKFrameInfo *)frame decisionHandler:(void (^)(BOOL authorized))decisionHandler WK_API_AVAILABLE(ios(11.0));
    138 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_API_AVAILABLE(ios(9.0));
    139 - (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController WK_API_AVAILABLE(ios(9.0));
    140 - (void)_webView:(WKWebView *)webView willPreviewImageWithURL:(NSURL *)imageURL WK_API_AVAILABLE(ios(9.0));
    141 - (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_API_AVAILABLE(ios(9.0));
    142 - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_API_AVAILABLE(ios(9.0));
    143 - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_API_AVAILABLE(ios(9.0));
     141- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(9.0, WK_IOS_TBA));
     142- (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController WK_API_DEPRECATED_WITH_REPLACEMENT("webView:commitContextMenu:", ios(9.0, WK_IOS_TBA));
     143- (void)_webView:(WKWebView *)webView willPreviewImageWithURL:(NSURL *)imageURL WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(9.0, WK_IOS_TBA));
     144- (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_API_DEPRECATED_WITH_REPLACEMENT("webView:commitContextMenu:", ios(9.0, WK_IOS_TBA));
     145- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_API_DEPRECATED_WITH_REPLACEMENT("webView:dismissContextMenu:", ios(9.0, WK_IOS_TBA));
     146- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_API_DEPRECATED_WITH_REPLACEMENT("webView:dismissContextMenu:", ios(9.0, WK_IOS_TBA));
     147
     148// This needs to be kept once there is an API version to continue to do callbacks for image element context menus.
     149- (void)_webView:(WKWebView *)webView contextMenuConfigurationForElement:(WKContextMenuElementInfo *)elementInfo completionHandler:(void(^)(UIContextMenuConfiguration *))completionHandler WK_API_AVAILABLE(ios(WK_IOS_TBA));
     150
     151// These can be removed once there is an API version.
     152- (void)_webView:(WKWebView *)webView contextMenuForElement:(WKContextMenuElementInfo *)elementInfo willCommitWithAnimator:(id<UIContextMenuInteractionCommitAnimating>)animator WK_API_AVAILABLE(ios(WK_IOS_TBA));
     153- (void)_webView:(WKWebView *)webView contextMenuWillPresentForElement:(WKContextMenuElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
     154- (void)_webView:(WKWebView *)webView contextMenuDidEndForElement:(WKContextMenuElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
     155
    144156- (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(10.0));
    145157- (void)_webView:(WKWebView *)webView alternateActionForURL:(NSURL *)url WK_API_AVAILABLE(ios(10.0));
    … …  
    148160- (NSUInteger)_webView:(WKWebView *)webView indexIntoAttachmentListForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(10.3));
    149161- (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset WK_API_AVAILABLE(ios(9.0));
    150 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_AVAILABLE(ios(9.0));
    151 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_API_AVAILABLE(ios(9.0));
     162- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:", ios(9.0, WK_IOS_TBA));
     163- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:", ios(9.0, WK_IOS_TBA));
    152164- (UIViewController *)_presentingViewControllerForWebView:(WKWebView *)webView WK_API_AVAILABLE(ios(10.0));
    153165- (void)_webView:(WKWebView *)webView getAlternateURLFromImage:(UIImage *)image completionHandler:(void (^)(NSURL *alternateURL, NSDictionary *userInfo))completionHandler WK_API_AVAILABLE(ios(11.0));
    154166- (NSURL *)_webView:(WKWebView *)webView alternateURLFromImage:(UIImage *)image userInfo:(NSDictionary **)userInfo WK_API_AVAILABLE(ios(11.0));
    155 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForImage:(UIImage *)image alternateURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_AVAILABLE(ios(11.0));
     167- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForImage:(UIImage *)image alternateURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:", ios(11.0, WK_IOS_TBA));
    156168- (NSArray *)_webView:(WKWebView *)webView adjustedDataInteractionItemProviders:(NSArray *)originalItemProviders WK_API_AVAILABLE(ios(11.0));
    157169- (NSArray *)_webView:(WKWebView *)webView adjustedDataInteractionItemProvidersForItemProvider:(id)itemProvider representingObjects:(NSArray *)representingObjects additionalData:(NSDictionary *)additionalData WK_API_AVAILABLE(ios(11.0));

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

    r244368 r246137  
    4848@property (nonatomic, readonly) CGRect boundingRect;
    4949@property (nonatomic, readonly) NSString *ID WK_API_AVAILABLE(macos(10.12), ios(10.0));
     50@property (nonatomic, readonly) BOOL isAnimatedImage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    5051#if TARGET_OS_IPHONE
    5152@property (nonatomic, readonly) NSDictionary *userInfo WK_API_AVAILABLE(ios(11.0));

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

    r244368 r246137  
    5252    RetainPtr<NSImage> _nsImage;
    5353#endif
     54    BOOL _animatedImage;
    5455}
    5556
    … …  
    8283    _image = information.image;
    8384    _ID = information.idAttribute;
     85    _animatedImage = information.isAnimatedImage;
    8486   
    8587    return self;
    … …  
    137139}
    138140
     141- (BOOL)isAnimatedImage
     142{
     143    return _animatedImage;
     144}
     145
    139146#if PLATFORM(IOS_FAMILY)
    140147- (NSDictionary *)userInfo

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h

    r245072 r246137  
    141141class WebPageProxy;
    142142class WebProcessPool;
     143class WebProcessProxy;
    143144struct ColorSpaceData;
    144145struct WebHitTestResultData;

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r245796 r246137  
    15701570    NSView *webView = m_view.getAutoreleased();
    15711571
    1572     if (direction == FocusDirectionForward) {
     1572    if (direction == WebCore::FocusDirectionForward) {
    15731573        // Since we're trying to move focus out of m_webView, and because
    15741574        // m_webView may contain subviews within it, we ask it for the next key
    … …  
    36123612        if ([parameter isKindOfClass:[NSValue class]]) {
    36133613            NSRect rect = [(NSValue *)parameter rectValue];
    3614             return [NSValue valueWithRect:m_pageClient->rootViewToScreen(IntRect(rect))];
     3614            return [NSValue valueWithRect:m_pageClient->rootViewToScreen(WebCore::IntRect(rect))];
    36153615        }
    36163616    }

  • trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h

    r242801 r246137  
    3939@class WKActionSheetAssistant;
    4040@class _WKActivatedElementInfo;
     41@class _WKElementAction;
    4142@protocol WKActionSheetDelegate;
    4243
    … …  
    7778- (void)cleanupSheet;
    7879- (void)updateSheetPosition;
    79 - (RetainPtr<NSArray>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo;
    80 - (RetainPtr<NSArray>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo;
     80- (RetainPtr<NSArray<_WKElementAction *>>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo;
     81- (RetainPtr<NSArray<_WKElementAction *>>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo;
    8182- (BOOL)isShowingSheet;
    8283- (void)interactionDidStartWithPositionInformation:(const WebKit::InteractionInformationAtPosition&)information;

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

    r246023 r246137  
    530530}
    531531
    532 - (RetainPtr<NSArray>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo
     532- (RetainPtr<NSArray<_WKElementAction *>>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo
    533533{
    534534    NSURL *targetURL = [elementInfo URL];
    … …  
    557557}
    558558
    559 - (RetainPtr<NSArray>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo
     559- (RetainPtr<NSArray<_WKElementAction *>>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo
    560560{
    561561    NSURL *targetURL = [elementInfo URL];

  • trunk/Source/WebKit/UIProcess/ios/WKContentView.h

    r245272 r246137  
    5555@package
    5656    RefPtr<WebKit::WebPageProxy> _page;
    57     WKWebView *_webView;
     57    WKWebView *_webView; // FIXME: This should be made a WeakObjCPtr once everything that refers to it is moved to OpenSource.
    5858}
    5959

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

    r246116 r246137  
    4343#import "UIKitSPI.h"
    4444#import "WKActionSheetAssistant.h"
     45#import "WKContextMenuElementInfoInternal.h"
    4546#import "WKDatePickerViewController.h"
    4647#import "WKDrawingCoordinator.h"
    … …  
    75167517            if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForAnimatedImageAtURL:defaultActions:elementInfo:imageSize:)]) {
    75177518                RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:animatedImageElementInfo.get()];
     7519                ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    75187520                return [uiDelegate _webView:_webView previewViewControllerForAnimatedImageAtURL:targetURL defaultActions:actions.get() elementInfo:animatedImageElementInfo.get() imageSize:_positionInformation.image->size()];
     7521                ALLOW_DEPRECATED_DECLARATIONS_END
    75197522            }
    75207523        }
    … …  
    75387541        }
    75397542
     7543        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    75407544        if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:defaultActions:elementInfo:)])
    75417545            return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL defaultActions:actions.get() elementInfo:elementInfo.get()];
    … …  
    75437547        if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:)])
    75447548            return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
     7549        ALLOW_DEPRECATED_DECLARATIONS_END
     7550
    75457551        return nil;
    75467552    }
    … …  
    75637569        _page->startInteractionWithElementAtPosition(_positionInformation.request.point);
    75647570
     7571        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    75657572        if ([uiDelegate respondsToSelector:@selector(_webView:willPreviewImageWithURL:)])
    75667573            [uiDelegate _webView:_webView willPreviewImageWithURL:targetURL];
     7574        ALLOW_DEPRECATED_DECLARATIONS_END
    75677575
    75687576        auto defaultActions = [_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()];
    75697577        if (imageInfo && [uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForImage:alternateURL:defaultActions:elementInfo:)]) {
     7578            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    75707579            UIViewController *previewViewController = [uiDelegate _webView:_webView previewViewControllerForImage:uiImage.get() alternateURL:alternateURL.get() defaultActions:defaultActions.get() elementInfo:elementInfo.get()];
     7580            ALLOW_DEPRECATED_DECLARATIONS_END
    75717581            if (previewViewController)
    75727582                return previewViewController;
    … …  
    75877597            if (imageURL.isEmpty() || !(imageURL.protocolIsInHTTPFamily() || imageURL.protocolIs("data")))
    75887598                return;
     7599            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    75897600            [uiDelegate _webView:_webView commitPreviewedImageWithURL:(NSURL *)imageURL];
     7601            ALLOW_DEPRECATED_DECLARATIONS_END
    75907602            return;
    75917603        }
    … …  
    76017613
    76027614    if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedViewController:)]) {
     7615        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    76037616        [uiDelegate _webView:_webView commitPreviewedViewController:viewController];
     7617        ALLOW_DEPRECATED_DECLARATIONS_END
    76047618        return;
    76057619    }
    … …  
    76257639{
    76267640    id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
     7641    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    76277642    if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:committing:)])
    76287643        [uiDelegate _webView:_webView didDismissPreviewViewController:viewController committing:committing];
    76297644    else if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:)])
    76307645        [uiDelegate _webView:_webView didDismissPreviewViewController:viewController];
    7631    
     7646    ALLOW_DEPRECATED_DECLARATIONS_END
     7647
    76327648    [_webView _didDismissForcePressPreview];
    76337649}

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r246118 r246137  
    10751075                5C5D238C227A2CDA000B9BDA /* _WKCustomHeaderFields.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5D2389227A1892000B9BDA /* _WKCustomHeaderFields.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10761076                5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1077                5C795D70229F373F003FF1C4 /* WKContextMenuElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
     1078                5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C36A229F2D4A003695F0 /* WKContextMenuElementInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10771079                5C7FB47021E97DC5009E3241 /* WebCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7FB46F21E97C0C009E3241 /* WebCookieJar.h */; };
    10781080                5C8BC797218CBB4800813886 /* SafeBrowsing.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C8BC796218CB58A00813886 /* SafeBrowsing.xcassets */; };
    … …  
    35773579                5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStoreInternal.h; sourceTree = "<group>"; };
    35783580                5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStorePrivate.h; sourceTree = "<group>"; };
     3581                5CE0C366229F2D3D003695F0 /* APIContextMenuElementInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIContextMenuElementInfo.cpp; sourceTree = "<group>"; };
     3582                5CE0C367229F2D3E003695F0 /* APIContextMenuElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContextMenuElementInfo.h; sourceTree = "<group>"; };
     3583                5CE0C368229F2D4A003695F0 /* WKContextMenuElementInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContextMenuElementInfo.mm; sourceTree = "<group>"; };
     3584                5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuElementInfo.h; sourceTree = "<group>"; };
     3585                5CE0C36A229F2D4A003695F0 /* WKContextMenuElementInfoPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuElementInfoPrivate.h; sourceTree = "<group>"; };
     3586                5CE0C36B229F2D4B003695F0 /* WKContextMenuElementInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuElementInfoInternal.h; sourceTree = "<group>"; };
    35793587                5CE85B1F1C88E6430070BFCE /* PingLoad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PingLoad.h; sourceTree = "<group>"; };
    35803588                5CE9120B2293C1E0005BEC78 /* WKMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMain.h; sourceTree = "<group>"; };
    … …  
    62586266                                5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */,
    62596267                                5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */,
     6268                                5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */,
     6269                                5CE0C368229F2D4A003695F0 /* WKContextMenuElementInfo.mm */,
     6270                                5CE0C36B229F2D4B003695F0 /* WKContextMenuElementInfoInternal.h */,
     6271                                5CE0C36A229F2D4A003695F0 /* WKContextMenuElementInfoPrivate.h */,
    62606272                                1AF4592D19464B2000F9D4A2 /* WKError.h */,
    62616273                                1AF4592C19464B2000F9D4A2 /* WKError.mm */,
    … …  
    77247736                                7C3A06A61AAB903E009D74BA /* APIContentRuleListStore.h */,
    77257737                                076E884D1A13CADF005E90FC /* APIContextMenuClient.h */,
     7738                                5CE0C366229F2D3D003695F0 /* APIContextMenuElementInfo.cpp */,
     7739                                5CE0C367229F2D3E003695F0 /* APIContextMenuElementInfo.h */,
    77267740                                5C5D238A227A1D9B000B9BDA /* APICustomHeaderFields.h */,
    77277741                                7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */,
    … …  
    99009914                                1A445BA1184D5FC1004B3414 /* WKContextHistoryClient.h in Headers */,
    99019915                                1A445B9F184D5FB5004B3414 /* WKContextInjectedBundleClient.h in Headers */,
     9916                                5C795D70229F373F003FF1C4 /* WKContextMenuElementInfo.h in Headers */,
     9917                                5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */,
    99029918                                51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */,
    99039919                                51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.