Changeset 236665 in webkit


Ignore:
Timestamp:
Oct 1, 2018 10:16:54 AM (6 years ago)
Author:
achristensen@apple.com
Message:

Deprecate ObjC SPI in Deprecated Xcode group
​https://bugs.webkit.org/show_bug.cgi?id=189850

Reviewed by Andy Estes.

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject):

  • Shared/mac/ObjCObjectGraph.mm:

(WebKit::typeFromObject):
(WebKit::ObjCObjectGraph::encode):
(WebKit::ObjCObjectGraph::decode):

  • UIProcess/API/Cocoa/WKBrowsingContextController.h:
  • UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(didStartProvisionalNavigation):
(didReceiveServerRedirectForProvisionalNavigation):
(didFailProvisionalNavigation):
(didCommitNavigation):
(didFinishNavigation):
(didFailNavigation):
(canAuthenticateAgainstProtectionSpace):
(didReceiveAuthenticationChallenge):
(processDidCrash):
(setUpPagePolicyClient):

  • UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
  • UIProcess/API/Cocoa/WKBrowsingContextGroupInternal.h:
  • UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h:
  • UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h:
  • UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h:
  • UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h:
  • UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.h:
  • UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm:

(-[WKNSURLAuthenticationChallengeSender cancelAuthenticationChallenge:]):
(-[WKNSURLAuthenticationChallengeSender continueWithoutCredentialForAuthenticationChallenge:]):
(-[WKNSURLAuthenticationChallengeSender useCredential:forAuthenticationChallenge:]):
(-[WKNSURLAuthenticationChallengeSender performDefaultHandlingForAuthenticationChallenge:]):
(-[WKNSURLAuthenticationChallengeSender rejectProtectionSpaceAndContinueWithChallenge:]):

  • UIProcess/API/Cocoa/WKNavigationData.h:
  • UIProcess/API/Cocoa/WKNavigationDataInternal.h:
  • UIProcess/API/Cocoa/WKProcessGroup.h:
  • UIProcess/API/Cocoa/WKProcessGroup.mm:

(didCreateConnection):
(getInjectedBundleInitializationUserData):
(didNavigateWithNavigationData):
(didPerformClientRedirect):
(didPerformServerRedirect):
(didUpdateHistoryTitle):

  • UIProcess/API/Cocoa/WKTypeRefWrapper.h:
  • UIProcess/API/Cocoa/WKView.h:

(WK_CLASS_DEPRECATED_WITH_REPLACEMENT):

  • UIProcess/API/Cocoa/_WKThumbnailView.h:
  • UIProcess/API/Cocoa/_WKThumbnailView.mm:
  • UIProcess/Cocoa/WebProcessProxyCocoa.mm:

(WebKit::WebProcessProxy::transformHandlesToObjects):
(WebKit::WebProcessProxy::transformObjectsToHandles):

  • UIProcess/Cocoa/WebViewImpl.h:
  • UIProcess/Cocoa/WebViewImpl.mm:
  • UIProcess/Gamepad/mac/UIGamepadProviderMac.mm:

(WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):

  • UIProcess/ios/WKContentView.h:
  • UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::inspectedViewFrameDidChange):

  • WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):

Location:
trunk/Source/WebKit
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r236662 r236665  
     12018-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Deprecate ObjC SPI in Deprecated Xcode group
     4        https://bugs.webkit.org/show_bug.cgi?id=189850
     5
     6        Reviewed by Andy Estes.
     7
     8        * Shared/Cocoa/APIObject.mm:
     9        (API::Object::newObject):
     10        * Shared/mac/ObjCObjectGraph.mm:
     11        (WebKit::typeFromObject):
     12        (WebKit::ObjCObjectGraph::encode):
     13        (WebKit::ObjCObjectGraph::decode):
     14        * UIProcess/API/Cocoa/WKBrowsingContextController.h:
     15        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     16        (didStartProvisionalNavigation):
     17        (didReceiveServerRedirectForProvisionalNavigation):
     18        (didFailProvisionalNavigation):
     19        (didCommitNavigation):
     20        (didFinishNavigation):
     21        (didFailNavigation):
     22        (canAuthenticateAgainstProtectionSpace):
     23        (didReceiveAuthenticationChallenge):
     24        (processDidCrash):
     25        (setUpPagePolicyClient):
     26        * UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
     27        * UIProcess/API/Cocoa/WKBrowsingContextGroupInternal.h:
     28        * UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h:
     29        * UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h:
     30        * UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h:
     31        * UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h:
     32        * UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.h:
     33        * UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm:
     34        (-[WKNSURLAuthenticationChallengeSender cancelAuthenticationChallenge:]):
     35        (-[WKNSURLAuthenticationChallengeSender continueWithoutCredentialForAuthenticationChallenge:]):
     36        (-[WKNSURLAuthenticationChallengeSender useCredential:forAuthenticationChallenge:]):
     37        (-[WKNSURLAuthenticationChallengeSender performDefaultHandlingForAuthenticationChallenge:]):
     38        (-[WKNSURLAuthenticationChallengeSender rejectProtectionSpaceAndContinueWithChallenge:]):
     39        * UIProcess/API/Cocoa/WKNavigationData.h:
     40        * UIProcess/API/Cocoa/WKNavigationDataInternal.h:
     41        * UIProcess/API/Cocoa/WKProcessGroup.h:
     42        * UIProcess/API/Cocoa/WKProcessGroup.mm:
     43        (didCreateConnection):
     44        (getInjectedBundleInitializationUserData):
     45        (didNavigateWithNavigationData):
     46        (didPerformClientRedirect):
     47        (didPerformServerRedirect):
     48        (didUpdateHistoryTitle):
     49        * UIProcess/API/Cocoa/WKTypeRefWrapper.h:
     50        * UIProcess/API/Cocoa/WKView.h:
     51        (WK_CLASS_DEPRECATED_WITH_REPLACEMENT):
     52        * UIProcess/API/Cocoa/_WKThumbnailView.h:
     53        * UIProcess/API/Cocoa/_WKThumbnailView.mm:
     54        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
     55        (WebKit::WebProcessProxy::transformHandlesToObjects):
     56        (WebKit::WebProcessProxy::transformObjectsToHandles):
     57        * UIProcess/Cocoa/WebViewImpl.h:
     58        * UIProcess/Cocoa/WebViewImpl.mm:
     59        * UIProcess/Gamepad/mac/UIGamepadProviderMac.mm:
     60        (WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
     61        * UIProcess/ios/WKContentView.h:
     62        * UIProcess/mac/WebInspectorProxyMac.mm:
     63        (WebKit::WebInspectorProxy::inspectedViewFrameDidChange):
     64        * WebProcess/cocoa/WebProcessCocoa.mm:
     65        (WebKit::WebProcess::transformHandlesToObjects):
     66        (WebKit::WebProcess::transformObjectsToHandles):
     67
    1682018-10-01  Youenn Fablet  <youenn@apple.com>
    269

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

    r235921 r236665  
    144144
    145145    case Type::AuthenticationChallenge:
     146        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    146147        wrapper = allocateWKObject([WKNSURLAuthenticationChallenge self], size);
     148        ALLOW_DEPRECATED_DECLARATIONS_END
    147149        break;
    148150
    … …  
    253255
    254256    case Type::NavigationData:
     257        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    255258        wrapper = [WKNavigationData alloc];
     259        ALLOW_DEPRECATED_DECLARATIONS_END
    256260        break;
    257261
    … …  
    267271
    268272    case Type::PageGroup:
     273        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    269274        wrapper = [WKBrowsingContextGroup alloc];
     275        ALLOW_DEPRECATED_DECLARATIONS_END
    270276        break;
    271277

  • trunk/Source/WebKit/Shared/mac/ObjCObjectGraph.mm

    r208985 r236665  
    134134    if (dynamic_objc_cast<WKBrowsingContextHandle>(object))
    135135        return ObjCType::WKBrowsingContextHandle;
     136    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    136137    if (dynamic_objc_cast<WKTypeRefWrapper>(object))
    137138        return ObjCType::WKTypeRefWrapper;
     139    ALLOW_DEPRECATED_DECLARATIONS_END
    138140#endif
    139141
    … …  
    197199
    198200    case ObjCType::WKTypeRefWrapper:
     201        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    199202        UserData::encode(encoder, toImpl(static_cast<WKTypeRefWrapper *>(object).object));
     203        ALLOW_DEPRECATED_DECLARATIONS_END
    200204        break;
    201205#endif
    … …  
    318322            return false;
    319323
     324        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    320325        result = adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(object.get())]);
     326        ALLOW_DEPRECATED_DECLARATIONS_END
    321327        break;
    322328    }

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

    r202789 r236665  
    3737@protocol WKBrowsingContextPolicyDelegate;
    3838
    39 WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
     39WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebView", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    4040@interface WKBrowsingContextController : NSObject
    4141
    … …  
    4848#pragma mark Loading
    4949
    50 + (void)registerSchemeForCustomProtocol:(NSString *)scheme;
    51 + (void)unregisterSchemeForCustomProtocol:(NSString *)scheme;
     50+ (void)registerSchemeForCustomProtocol:(NSString *)scheme WK_API_DEPRECATED_WITH_REPLACEMENT("WKURLSchemeHandler", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
     51+ (void)unregisterSchemeForCustomProtocol:(NSString *)scheme WK_API_DEPRECATED_WITH_REPLACEMENT("WKURLSchemeHandler", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
    5252
    5353/* Load a request. This is only valid for requests of non-file: URLs. Passing a

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

    r236436 r236665  
    8181}
    8282
     83ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8384static HashMap<WebKit::WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>& browsingContextControllerMap()
    8485{
    … …  
    8687    return browsingContextControllerMap;
    8788}
     89ALLOW_DEPRECATED_DECLARATIONS_END
    8890
    8991- (void)dealloc
    … …  
    320322static void didStartProvisionalNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    321323{
    322     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     324    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     325    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     326    ALLOW_DEPRECATED_DECLARATIONS_END
    323327    auto loadDelegate = browsingContext->_loadDelegate.get();
    324328
    … …  
    329333static void didReceiveServerRedirectForProvisionalNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    330334{
    331     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     335    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     336    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     337    ALLOW_DEPRECATED_DECLARATIONS_END
    332338    auto loadDelegate = browsingContext->_loadDelegate.get();
    333339
    … …  
    338344static void didFailProvisionalNavigation(WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
    339345{
    340     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     346    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     347    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     348    ALLOW_DEPRECATED_DECLARATIONS_END
    341349    auto loadDelegate = browsingContext->_loadDelegate.get();
    342350
    … …  
    347355static void didCommitNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    348356{
    349     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     357    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     358    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     359    ALLOW_DEPRECATED_DECLARATIONS_END
    350360    auto loadDelegate = browsingContext->_loadDelegate.get();
    351361
    … …  
    356366static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    357367{
    358     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     368    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     369    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     370    ALLOW_DEPRECATED_DECLARATIONS_END
    359371    auto loadDelegate = browsingContext->_loadDelegate.get();
    360372
    … …  
    365377static void didFailNavigation(WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
    366378{
    367     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     379    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     380    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     381    ALLOW_DEPRECATED_DECLARATIONS_END
    368382    auto loadDelegate = browsingContext->_loadDelegate.get();
    369383
    … …  
    374388static bool canAuthenticateAgainstProtectionSpace(WKPageRef page, WKProtectionSpaceRef protectionSpace, const void *clientInfo)
    375389{
    376     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     390    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     391    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     392    ALLOW_DEPRECATED_DECLARATIONS_END
    377393    auto loadDelegate = browsingContext->_loadDelegate.get();
    378394
    … …  
    385401static void didReceiveAuthenticationChallenge(WKPageRef page, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo)
    386402{
    387     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     403    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     404    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     405    ALLOW_DEPRECATED_DECLARATIONS_END
    388406    auto loadDelegate = browsingContext->_loadDelegate.get();
    389407
    … …  
    394412static void processDidCrash(WKPageRef page, const void* clientInfo)
    395413{
    396     auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     414    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     415    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     416    ALLOW_DEPRECATED_DECLARATIONS_END
    397417    auto loadDelegate = browsingContext->_loadDelegate.get();
    398418
    … …  
    454474    policyClient.decidePolicyForNavigationAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef originalRequest, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
    455475    {
     476        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    456477        auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     478        ALLOW_DEPRECATED_DECLARATIONS_END
    457479        auto policyDelegate = browsingContext->_policyDelegate.get();
    458480
    … …  
    479501    policyClient.decidePolicyForNewWindowAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
    480502    {
     503        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    481504        auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     505        ALLOW_DEPRECATED_DECLARATIONS_END
    482506        auto policyDelegate = browsingContext->_policyDelegate.get();
    483507
    … …  
    499523    policyClient.decidePolicyForResponse = [](WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
    500524    {
     525        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    501526        auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     527        ALLOW_DEPRECATED_DECLARATIONS_END
    502528        auto policyDelegate = browsingContext->_policyDelegate.get();
    503529
    … …  
    592618@end
    593619
     620ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    594621@implementation WKBrowsingContextController (Private)
    595622
    … …  
    714741
    715742@end
     743ALLOW_DEPRECATED_DECLARATIONS_END
    716744
    717745#endif // WK_API_ENABLED

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

    r202789 r236665  
    3131#import <WebKit/WKUserScriptInjectionTime.h>
    3232
    33 WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
     33WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKUserContentController and WKPreferences", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3434@interface WKBrowsingContextGroup : NSObject
    3535

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

    r235828 r236665  
    176176@end
    177177
     178ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    178179@implementation WKBrowsingContextGroup (Private)
    179180
    … …  
    184185
    185186@end
     187ALLOW_DEPRECATED_DECLARATIONS_END
    186188
    187189#endif // WK_API_ENABLED

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

    r235019 r236665  
    3434
    3535template<> struct WrapperTraits<WebPageGroup> {
     36    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    3637    using WrapperClass = WKBrowsingContextGroup;
     38    ALLOW_DEPRECATED_DECLARATIONS_END
    3739};
    3840

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

    r168541 r236665  
    3232#import <WebKit/WKNavigationData.h>
    3333
     34WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKBackForwardList", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3435@protocol WKBrowsingContextHistoryDelegate <NSObject>
    3536@optional

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

    r235385 r236665  
    3333@class WKBackForwardListItem;
    3434
     35WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKNavigationDelegate", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3536@protocol WKBrowsingContextLoadDelegate <NSObject>
    3637@optional

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

    r168541 r236665  
    2626#import <WebKit/WKBrowsingContextLoadDelegate.h>
    2727
     28#pragma clang diagnostic push
     29#pragma clang diagnostic ignored "-Wdeprecated-declarations"
    2830@protocol WKBrowsingContextLoadDelegatePrivate <WKBrowsingContextLoadDelegate>
    2931@optional
    … …  
    3537
    3638@end
     39#pragma clang diagnostic pop

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

    r168541 r236665  
    4848typedef void (^WKPolicyDecisionHandler)(WKPolicyDecision);
    4949
     50WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKNavigationDelegate", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    5051@protocol WKBrowsingContextPolicyDelegate <NSObject>
    5152@optional

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

    r235019 r236665  
    3939}
    4040
     41WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKNavigationDelegate", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    4142@interface WKNSURLAuthenticationChallenge : WKObject
    4243@end

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

    r236344 r236665  
    6464static void checkChallenge(NSURLAuthenticationChallenge *challenge)
    6565{
     66    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    6667    if ([challenge class] != [WKNSURLAuthenticationChallenge class])
    6768        [NSException raise:NSInvalidArgumentException format:@"The challenge was not sent by the receiver."];
     69    ALLOW_DEPRECATED_DECLARATIONS_END
    6870}
    6971
    … …  
    7173{
    7274    checkChallenge(challenge);
     75    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    7376    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
     77    ALLOW_DEPRECATED_DECLARATIONS_END
    7478    webChallenge.listener().completeChallenge(WebKit::AuthenticationChallengeDisposition::Cancel);
    7579}
    … …  
    7882{
    7983    checkChallenge(challenge);
     84    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8085    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
     86    ALLOW_DEPRECATED_DECLARATIONS_END
    8187    webChallenge.listener().completeChallenge(WebKit::AuthenticationChallengeDisposition::UseCredential);
    8288}
    … …  
    8591{
    8692    checkChallenge(challenge);
     93    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8794    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
     95    ALLOW_DEPRECATED_DECLARATIONS_END
    8896    webChallenge.listener().completeChallenge(WebKit::AuthenticationChallengeDisposition::UseCredential, WebCore::Credential(credential));
    8997}
    … …  
    92100{
    93101    checkChallenge(challenge);
     102    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    94103    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
     104    ALLOW_DEPRECATED_DECLARATIONS_END
    95105    webChallenge.listener().completeChallenge(WebKit::AuthenticationChallengeDisposition::PerformDefaultHandling);
    96106}
    … …  
    99109{
    100110    checkChallenge(challenge);
     111    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    101112    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
     113    ALLOW_DEPRECATED_DECLARATIONS_END
    102114    webChallenge.listener().completeChallenge(WebKit::AuthenticationChallengeDisposition::RejectProtectionSpaceAndContinue);
    103115}

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

    r202789 r236665  
    3434#import <Foundation/Foundation.h>
    3535
    36 WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
     36WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKNavigation", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3737@interface WKNavigationData : NSObject
    3838

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

    r235019 r236665  
    3434
    3535template<> struct WrapperTraits<API::NavigationData> {
     36    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    3637    using WrapperClass = WKNavigationData;
     38    ALLOW_DEPRECATED_DECLARATIONS_END
    3739};
    3840

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

    r202789 r236665  
    4444@end
    4545
    46 WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
     46WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKProcessPool", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    4747@interface WKProcessGroup : NSObject
    4848

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

    r235828 r236665  
    6565static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
    6666{
     67    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    6768    auto processGroup = (__bridge WKProcessGroup *)clientInfo;
     69    ALLOW_DEPRECATED_DECLARATIONS_END
    6870    auto delegate = processGroup->_delegate.get();
    6971
    … …  
    8688static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
    8789{
     90    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8891    auto processGroup = (__bridge WKProcessGroup *)clientInfo;
     92    ALLOW_DEPRECATED_DECLARATIONS_END
    8993    auto delegate = processGroup->_delegate.get();
    9094
    … …  
    115119        return;
    116120
    117     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     121    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     122    WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     123    ALLOW_DEPRECATED_DECLARATIONS_END
    118124    auto historyDelegate = controller->_historyDelegate.get();
    119125
    … …  
    127133        return;
    128134
    129     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     135    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     136    WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     137    ALLOW_DEPRECATED_DECLARATIONS_END
    130138    auto historyDelegate = controller->_historyDelegate.get();
    131139
    … …  
    139147        return;
    140148
    141     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     149    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     150    WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     151    ALLOW_DEPRECATED_DECLARATIONS_END
    142152    auto historyDelegate = controller->_historyDelegate.get();
    143153
    … …  
    151161        return;
    152162
    153     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     163    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     164    WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
     165    ALLOW_DEPRECATED_DECLARATIONS_END
    154166    auto historyDelegate = controller->_historyDelegate.get();
    155167
    … …  
    208220@end
    209221
     222ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    210223@implementation WKProcessGroup (Private)
    211224
    … …  
    230243
    231244@end
     245ALLOW_DEPRECATED_DECLARATIONS_END
    232246
    233247#endif // WK_API_ENABLED

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

    r202789 r236665  
    3131#import <WebKit/WKBase.h>
    3232
    33 WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
     33WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKObject", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3434@interface WKTypeRefWrapper : NSObject
    3535

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

    r188892 r236665  
    3636@class WKViewData;
    3737
    38 WK_EXPORT
     38WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebView", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3939@interface WKView : NSView <NSTextInputClient> {
    4040@private
    … …  
    4848- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
    4949
     50#pragma clang diagnostic push
     51#pragma clang diagnostic ignored "-Wdeprecated-declarations"
    5052@property(readonly) WKBrowsingContextController *browsingContextController;
     53#pragma clang diagnostic pop
    5154
    5255#endif // WK_API_ENABLED

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

    r236634 r236665  
    13391339}
    13401340
     1341ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    13411342- (WKBrowsingContextController *)browsingContextController
    13421343{
    13431344    return [_contentView browsingContextController];
    13441345}
     1346ALLOW_DEPRECATED_DECLARATIONS_END
    13451347
    13461348- (BOOL)becomeFirstResponder

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

    r233945 r236665  
    3838@interface _WKThumbnailView : NSView
    3939
     40#pragma clang diagnostic push
     41#pragma clang diagnostic ignored "-Wdeprecated-declarations"
    4042- (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView;
     43#pragma clang diagnostic pop
    4144- (instancetype)initWithFrame:(NSRect)frame fromWKWebView:(WKWebView *)webView;
    4245

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

    r235828 r236665  
    4545
    4646@implementation _WKThumbnailView {
     47    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    4748    RetainPtr<WKView> _wkView;
     49    ALLOW_DEPRECATED_DECLARATIONS_END
    4850    RetainPtr<WKWebView> _wkWebView;
    4951    WebKit::WebPageProxy* _webPageProxy;
    … …  
    7678}
    7779
     80ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    7881- (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView
    7982{
    … …  
    8891    return self;
    8992}
     93ALLOW_DEPRECATED_DECLARATIONS_END
    9094
    9195- (instancetype)initWithFrame:(NSRect)frame fromWKWebView:(WKWebView *)webView

  • trunk/Source/WebKit/UIProcess/API/mac/WKView.mm

    r235935 r236665  
    873873{
    874874#if WK_API_ENABLED
     875    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    875876    class IconLoadingClient : public API::IconLoadingClient {
    876877    public:
    … …  
    908909        WKView *m_wkView;
    909910    };
     911    ALLOW_DEPRECATED_DECLARATIONS_END
    910912
    911913    if ([self respondsToSelector:IconLoadingClient::delegateSelector()])
    … …  
    11191121@end
    11201122
     1123ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    11211124@implementation WKView (Private)
    11221125
    … …  
    16761679
    16771680@end
     1681ALLOW_DEPRECATED_DECLARATIONS_END
    16781682
    16791683#endif // PLATFORM(MAC)

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

    r232136 r236665  
    6363                return true;
    6464
     65            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    6566            if (dynamic_objc_cast<WKTypeRefWrapper>(object))
    6667                return true;
     68            ALLOW_DEPRECATED_DECLARATIONS_END
    6769#endif
    6870            return false;
    … …  
    7375#if WK_API_ENABLED
    7476            if (auto* handle = dynamic_objc_cast<WKBrowsingContextHandle>(object)) {
    75                 if (auto* webPageProxy = m_webProcessProxy.webPage(handle.pageID))
     77                if (auto* webPageProxy = m_webProcessProxy.webPage(handle.pageID)) {
     78                    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    7679                    return [WKBrowsingContextController _browsingContextControllerForPageRef:toAPI(webPageProxy)];
     80                    ALLOW_DEPRECATED_DECLARATIONS_END
     81                }
    7782
    7883                return [NSNull null];
    7984            }
    8085
     86            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8187            if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object))
    8288                return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(m_webProcessProxy.transformHandlesToObjects(toImpl(wrapper.object)).get())]);
    83 
     89            ALLOW_DEPRECATED_DECLARATIONS_END
    8490#endif
    8591            return object;
    … …  
    98104        {
    99105#if WK_API_ENABLED
     106            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    100107            if (dynamic_objc_cast<WKBrowsingContextController>(object))
    101108                return true;
    102 
    103109            if (dynamic_objc_cast<WKTypeRefWrapper>(object))
    104110                return true;
     111            ALLOW_DEPRECATED_DECLARATIONS_END
    105112#endif
    106113            return false;
    … …  
    110117        {
    111118#if WK_API_ENABLED
     119            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    112120            if (auto* controller = dynamic_objc_cast<WKBrowsingContextController>(object))
    113121                return controller.handle;
    114 
    115122            if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object))
    116123                return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(transformObjectsToHandles(toImpl(wrapper.object)).get())]);
    117 
     124            ALLOW_DEPRECATED_DECLARATIONS_END
    118125#endif
    119126

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

    r235944 r236665  
    428428    _WKRemoteObjectRegistry *remoteObjectRegistry();
    429429
     430    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    430431    WKBrowsingContextController *browsingContextController();
     432    ALLOW_DEPRECATED_DECLARATIONS_END
    431433#endif // WK_API_ENABLED
    432434
    … …  
    750752    RetainPtr<_WKRemoteObjectRegistry> m_remoteObjectRegistry;
    751753
     754    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    752755    RetainPtr<WKBrowsingContextController> m_browsingContextController;
     756    ALLOW_DEPRECATED_DECLARATIONS_END
    753757#endif
    754758

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

    r236257 r236665  
    37903790}
    37913791
     3792ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    37923793WKBrowsingContextController *WebViewImpl::browsingContextController()
    37933794{
    … …  
    37973798    return m_browsingContextController.get();
    37983799}
     3800ALLOW_DEPRECATED_DECLARATIONS_END
    37993801#endif // WK_API_ENABLED
    38003802

  • trunk/Source/WebKit/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm

    r231980 r236665  
    4747#endif
    4848
     49    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    4950    if ([responder isKindOfClass:[WKView class]])
    5051        return toImpl(((WKView *)responder).pageRef);
     52    ALLOW_DEPRECATED_DECLARATIONS_END
    5153
    5254    return nullptr;

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

    r236500 r236665  
    5656}
    5757
     58#pragma clang diagnostic push
     59#pragma clang diagnostic ignored "-Wdeprecated-declarations"
    5860@property (nonatomic, readonly) WKBrowsingContextController *browsingContextController;
     61#pragma clang diagnostic pop
    5962
    6063@property (nonatomic, readonly) WebKit::WebPageProxy* page;

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

    r236500 r236665  
    173173@implementation WKContentView {
    174174    std::unique_ptr<PageClientImpl> _pageClient;
     175    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    175176    RetainPtr<WKBrowsingContextController> _browsingContextController;
     177    ALLOW_DEPRECATED_DECLARATIONS_END
    176178
    177179    RetainPtr<UIView> _rootContentView;
    … …  
    276278}
    277279
     280ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    278281- (WKBrowsingContextController *)browsingContextController
    279282{
    … …  
    283286    return _browsingContextController.get();
    284287}
     288ALLOW_DEPRECATED_DECLARATIONS_END
    285289
    286290- (WKPageRef)_pageRef

  • trunk/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm

    r236411 r236665  
    525525        inspectedViewFrame = NSMakeRect(0, 0, parentWidth - inspectorWidth, inspectedViewTop);
    526526        CGFloat insetExcludingBanners = 0;
     527        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    527528        if ([inspectedView isKindOfClass:[WKView class]])
    528529            insetExcludingBanners = ((WKView *)inspectedView)._topContentInset - ((WKView *)inspectedView)._totalHeightOfBanners;
     530        ALLOW_DEPRECATED_DECLARATIONS_END
    529531        if ([inspectedView isKindOfClass:[WKWebView class]])
    530532            insetExcludingBanners = ((WKWebView *)inspectedView)._topContentInset - ((WKWebView *)inspectedView)._totalHeightOfBanners;
    … …  
    544546        inspectedViewFrame = NSMakeRect(inspectorWidth, 0, parentWidth - inspectorWidth, inspectedViewTop);
    545547        CGFloat insetExcludingBanners = 0;
     548        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    546549        if ([inspectedView isKindOfClass:[WKView class]])
    547550            insetExcludingBanners = ((WKView *)inspectedView)._topContentInset - ((WKView *)inspectedView)._totalHeightOfBanners;
     551        ALLOW_DEPRECATED_DECLARATIONS_END
    548552        if ([inspectedView isKindOfClass:[WKWebView class]])
    549553            insetExcludingBanners = ((WKWebView *)inspectedView)._topContentInset - ((WKWebView *)inspectedView)._totalHeightOfBanners;

  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r235365 r236665  
    506506                return true;
    507507
     508            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    508509            if (dynamic_objc_cast<WKTypeRefWrapper>(object))
    509510                return true;
     511            ALLOW_DEPRECATED_DECLARATIONS_END
    510512#endif
    511513            return false;
    … …  
    522524            }
    523525
     526            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    524527            if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object))
    525528                return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(m_webProcess.transformHandlesToObjects(toImpl(wrapper.object)).get())]);
     529            ALLOW_DEPRECATED_DECLARATIONS_END
    526530#endif
    527531            return object;
    … …  
    543547                return true;
    544548
     549            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    545550            if (dynamic_objc_cast<WKTypeRefWrapper>(object))
    546551                return true;
     552            ALLOW_DEPRECATED_DECLARATIONS_END
    547553#endif
    548554
    … …  
    556562                return controller.handle;
    557563
     564            ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    558565            if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object))
    559566                return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(transformObjectsToHandles(toImpl(wrapper.object)).get())]);
     567            ALLOW_DEPRECATED_DECLARATIONS_END
    560568#endif
    561569            return object;
Note: See TracChangeset for help on using the changeset viewer.