Changeset 202789 in webkit


Ignore:
Timestamp:
Jul 3, 2016 10:08:20 AM (8 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Adopt modern API availability macros
​https://bugs.webkit.org/show_bug.cgi?id=159378

Reviewed by Sam Weinig.

iOS 10 and macOS Sierra introduce new macros for declaring API availability, defined in
CFAvailability.h, including API_AVAILABLE, API_DEPRECATED, and
API_DEPRECATED_WITH_REPLACEMENT. Rather than having positional parameters for macOS and iOS
versions, the new macros take a variable number of function-like parameters, where the
function specifies the platform to which it applies.

To have WebKit2’s postprocessed headers use the new macros, we make the following changes:

  • Replace instances of WK_AVAILABLE(_mac, _ios) with WK_API_AVAILABLE(macosx(_mac), ios(_ios)), eliding a platform if its current availability is NA.
  • Change instances of WK_CLASS_AVAILABLE(_mac, _ios) to WK_CLASS_AVAILABLE(macosx(_mac), ios(_ios)), eliding a platform if its current availability is NA.
  • Replace instances of WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) with WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, macosx(_macIntro, _macDep), ios(_iosIntro, _iosDep)) when there is a one-for-one replacement, and with WK_API_DEPRECATED(_message, macosx(_macIntro, _macDep), ios(_iosIntro, _iosDep)) when the replacement isn’t one-for-one. Again, if the API doesn’t apply to a platform, then it’s elided.
  • Replace instances of WK_CLASS_DEPRECATED with WK_CLASS_DEPRECATED_WITH_REPLACEMENT, following the same rules.
  • Replace instances of the WK_ENUM_* macros with corresponding WK_API_* macros, now that all supported compilers support availability attributes on enum values.
  • Configurations/WebKit.xcconfig: Disable header postprocessing when building for iOS 9.x, which doesn’t have the new macros.
  • mac/postprocess-framework-headers.sh: Handle the new WK_* macros: WK_API_AVAILABLE becomes API_AVAILABLE; WK_API_DEPRECATED(_WITH_REPLACEMENT) become API_DEPRECATED(_WITH_REPLACEMENT); WK_CLASS_AVAILABLE and WK_CLASS_DEPRECATED(_WITH_REPLACEMENT) change to the corresponding API_ macros, prefixed with WK_EXTERN.
  • Shared/API/Cocoa/WKFoundation.h: When header postprocessing is disabled, provide definitions of the new WK_* macros we use.
  • UIProcess/API/Cocoa/WKWebViewConfiguration.h: In addition to the above, changed one instance of (iOS) 10_0 to WK_IOS_TBA.

Made the above changes in the following headers:

  • Shared/API/Cocoa/WKBrowsingContextHandle.h:
  • Shared/API/Cocoa/_WKFrameHandle.h:
  • Shared/API/Cocoa/_WKHitTestResult.h:
  • Shared/API/Cocoa/_WKRemoteObjectInterface.h:
  • Shared/API/Cocoa/_WKRemoteObjectRegistry.h:
  • Shared/API/Cocoa/_WKRenderingProgressEvents.h:
  • Shared/API/Cocoa/_WKSameDocumentNavigationType.h:
  • UIProcess/API/Cocoa/WKBackForwardList.h:
  • UIProcess/API/Cocoa/WKBackForwardListItem.h:
  • UIProcess/API/Cocoa/WKBrowsingContextController.h:
  • UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
  • UIProcess/API/Cocoa/WKConnection.h:
  • UIProcess/API/Cocoa/WKError.h:
  • UIProcess/API/Cocoa/WKErrorPrivate.h:
  • UIProcess/API/Cocoa/WKFrameInfo.h:
  • UIProcess/API/Cocoa/WKFrameInfoPrivate.h:
  • UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
  • UIProcess/API/Cocoa/WKNavigation.h:
  • UIProcess/API/Cocoa/WKNavigationAction.h:
  • UIProcess/API/Cocoa/WKNavigationActionPrivate.h:
  • UIProcess/API/Cocoa/WKNavigationData.h:
  • UIProcess/API/Cocoa/WKNavigationDelegate.h:
  • UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
  • UIProcess/API/Cocoa/WKNavigationResponse.h:
  • UIProcess/API/Cocoa/WKOpenPanelParameters.h:
  • UIProcess/API/Cocoa/WKPreferences.h:
  • UIProcess/API/Cocoa/WKPreferencesPrivate.h:
  • UIProcess/API/Cocoa/WKPreviewActionItem.h:
  • UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h:
  • UIProcess/API/Cocoa/WKPreviewElementInfo.h:
  • UIProcess/API/Cocoa/WKProcessGroup.h:
  • UIProcess/API/Cocoa/WKProcessPool.h:
  • UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
  • UIProcess/API/Cocoa/WKScriptMessage.h:
  • UIProcess/API/Cocoa/WKSecurityOrigin.h:
  • UIProcess/API/Cocoa/WKTypeRefWrapper.h:
  • UIProcess/API/Cocoa/WKUIDelegate.h:
  • UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
  • UIProcess/API/Cocoa/WKUserContentController.h:
  • UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
  • UIProcess/API/Cocoa/WKUserScript.h:
  • UIProcess/API/Cocoa/WKUserScriptPrivate.h:
  • UIProcess/API/Cocoa/WKViewPrivate.h:
  • UIProcess/API/Cocoa/WKWebView.h:
  • UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
  • UIProcess/API/Cocoa/WKWebViewPrivate.h:
  • UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
  • UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
  • UIProcess/API/Cocoa/WKWebsiteDataStore.h:
  • UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
  • UIProcess/API/Cocoa/WKWindowFeatures.h:
  • UIProcess/API/Cocoa/_WKActivatedElementInfo.h:
  • UIProcess/API/Cocoa/_WKAutomationSession.h:
  • UIProcess/API/Cocoa/_WKContextMenuElementInfo.h:
  • UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h:
  • UIProcess/API/Cocoa/_WKDownload.h:
  • UIProcess/API/Cocoa/_WKElementAction.h:
  • UIProcess/API/Cocoa/_WKExperimentalFeature.h:
  • UIProcess/API/Cocoa/_WKFindOptions.h:
  • UIProcess/API/Cocoa/_WKFormInputSession.h:
  • UIProcess/API/Cocoa/_WKInputDelegate.h:
  • UIProcess/API/Cocoa/_WKLayoutMode.h:
  • UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKSessionState.h:
  • UIProcess/API/Cocoa/_WKThumbnailView.h:
  • UIProcess/API/Cocoa/_WKUserContentExtensionStore.h:
  • UIProcess/API/Cocoa/_WKUserContentFilter.h:
  • UIProcess/API/Cocoa/_WKUserContentWorld.h:
  • UIProcess/API/Cocoa/_WKUserStyleSheet.h:
  • UIProcess/API/Cocoa/_WKVisitedLinkProvider.h:
  • UIProcess/API/Cocoa/_WKVisitedLinkStore.h:
  • UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
  • UIProcess/API/Cocoa/_WKWebsiteDataSize.h:
  • UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h:
  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h:
  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h:
  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h:
  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h:
  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h:
  • WebProcess/InjectedBundle/API/mac/WKDOMDocument.h:
  • WebProcess/InjectedBundle/API/mac/WKDOMElement.h:
  • WebProcess/InjectedBundle/API/mac/WKDOMNode.h:
  • WebProcess/InjectedBundle/API/mac/WKDOMRange.h:
  • WebProcess/InjectedBundle/API/mac/WKDOMText.h:
  • WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h:
  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h:
  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h:
Location:
trunk/Source/WebKit2
Files:
94 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r202773 r202789  
     12016-07-03  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Adopt modern API availability macros
     4        https://bugs.webkit.org/show_bug.cgi?id=159378
     5
     6        Reviewed by Sam Weinig.
     7
     8        iOS 10 and macOS Sierra introduce new macros for declaring API availability, defined in
     9        CFAvailability.h, including API_AVAILABLE, API_DEPRECATED, and
     10        API_DEPRECATED_WITH_REPLACEMENT. Rather than having positional parameters for macOS and iOS
     11        versions, the new macros take a variable number of function-like parameters, where the
     12        function specifies the platform to which it applies.
     13
     14        To have WebKit2’s postprocessed headers use the new macros, we make the following changes:
     15
     16        - Replace instances of WK_AVAILABLE(_mac, _ios) with WK_API_AVAILABLE(macosx(_mac), ios(_ios)),
     17          eliding a platform if its current availability is NA.
     18        - Change instances of WK_CLASS_AVAILABLE(_mac, _ios) to
     19          WK_CLASS_AVAILABLE(macosx(_mac), ios(_ios)), eliding a platform if its current
     20          availability is NA.
     21        - Replace instances of WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) with
     22          WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, macosx(_macIntro, _macDep), ios(_iosIntro, _iosDep))
     23          when there is a one-for-one replacement, and with
     24          WK_API_DEPRECATED(_message, macosx(_macIntro, _macDep), ios(_iosIntro, _iosDep)) when the
     25          replacement isn’t one-for-one. Again, if the API doesn’t apply to a platform, then it’s
     26          elided.
     27        - Replace instances of WK_CLASS_DEPRECATED with WK_CLASS_DEPRECATED_WITH_REPLACEMENT,
     28          following the same rules.
     29        - Replace instances of the WK_ENUM_* macros with corresponding WK_API_* macros, now that
     30          all supported compilers support availability attributes on enum values.
     31
     32        * Configurations/WebKit.xcconfig: Disable header postprocessing when building for iOS 9.x,
     33          which doesn’t have the new macros.
     34
     35        * mac/postprocess-framework-headers.sh: Handle the new WK_* macros: WK_API_AVAILABLE becomes
     36          API_AVAILABLE; WK_API_DEPRECATED(_WITH_REPLACEMENT) become API_DEPRECATED(_WITH_REPLACEMENT);
     37          WK_CLASS_AVAILABLE and WK_CLASS_DEPRECATED(_WITH_REPLACEMENT) change to the corresponding
     38          API_ macros, prefixed with WK_EXTERN.
     39        * Shared/API/Cocoa/WKFoundation.h: When header postprocessing is disabled, provide
     40          definitions of the new WK_* macros we use.
     41
     42        * UIProcess/API/Cocoa/WKWebViewConfiguration.h: In addition to the above, changed one
     43          instance of (iOS) 10_0 to WK_IOS_TBA.
     44
     45        Made the above changes in the following headers:
     46
     47        * Shared/API/Cocoa/WKBrowsingContextHandle.h:
     48        * Shared/API/Cocoa/_WKFrameHandle.h:
     49        * Shared/API/Cocoa/_WKHitTestResult.h:
     50        * Shared/API/Cocoa/_WKRemoteObjectInterface.h:
     51        * Shared/API/Cocoa/_WKRemoteObjectRegistry.h:
     52        * Shared/API/Cocoa/_WKRenderingProgressEvents.h:
     53        * Shared/API/Cocoa/_WKSameDocumentNavigationType.h:
     54        * UIProcess/API/Cocoa/WKBackForwardList.h:
     55        * UIProcess/API/Cocoa/WKBackForwardListItem.h:
     56        * UIProcess/API/Cocoa/WKBrowsingContextController.h:
     57        * UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
     58        * UIProcess/API/Cocoa/WKConnection.h:
     59        * UIProcess/API/Cocoa/WKError.h:
     60        * UIProcess/API/Cocoa/WKErrorPrivate.h:
     61        * UIProcess/API/Cocoa/WKFrameInfo.h:
     62        * UIProcess/API/Cocoa/WKFrameInfoPrivate.h:
     63        * UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
     64        * UIProcess/API/Cocoa/WKNavigation.h:
     65        * UIProcess/API/Cocoa/WKNavigationAction.h:
     66        * UIProcess/API/Cocoa/WKNavigationActionPrivate.h:
     67        * UIProcess/API/Cocoa/WKNavigationData.h:
     68        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
     69        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
     70        * UIProcess/API/Cocoa/WKNavigationResponse.h:
     71        * UIProcess/API/Cocoa/WKOpenPanelParameters.h:
     72        * UIProcess/API/Cocoa/WKPreferences.h:
     73        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
     74        * UIProcess/API/Cocoa/WKPreviewActionItem.h:
     75        * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h:
     76        * UIProcess/API/Cocoa/WKPreviewElementInfo.h:
     77        * UIProcess/API/Cocoa/WKProcessGroup.h:
     78        * UIProcess/API/Cocoa/WKProcessPool.h:
     79        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
     80        * UIProcess/API/Cocoa/WKScriptMessage.h:
     81        * UIProcess/API/Cocoa/WKSecurityOrigin.h:
     82        * UIProcess/API/Cocoa/WKTypeRefWrapper.h:
     83        * UIProcess/API/Cocoa/WKUIDelegate.h:
     84        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
     85        * UIProcess/API/Cocoa/WKUserContentController.h:
     86        * UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
     87        * UIProcess/API/Cocoa/WKUserScript.h:
     88        * UIProcess/API/Cocoa/WKUserScriptPrivate.h:
     89        * UIProcess/API/Cocoa/WKViewPrivate.h:
     90        * UIProcess/API/Cocoa/WKWebView.h:
     91        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
     92        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
     93        * UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
     94        * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
     95        * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
     96        * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
     97        * UIProcess/API/Cocoa/WKWindowFeatures.h:
     98        * UIProcess/API/Cocoa/_WKActivatedElementInfo.h:
     99        * UIProcess/API/Cocoa/_WKAutomationSession.h:
     100        * UIProcess/API/Cocoa/_WKContextMenuElementInfo.h:
     101        * UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h:
     102        * UIProcess/API/Cocoa/_WKDownload.h:
     103        * UIProcess/API/Cocoa/_WKElementAction.h:
     104        * UIProcess/API/Cocoa/_WKExperimentalFeature.h:
     105        * UIProcess/API/Cocoa/_WKFindOptions.h:
     106        * UIProcess/API/Cocoa/_WKFormInputSession.h:
     107        * UIProcess/API/Cocoa/_WKInputDelegate.h:
     108        * UIProcess/API/Cocoa/_WKLayoutMode.h:
     109        * UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h:
     110        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     111        * UIProcess/API/Cocoa/_WKSessionState.h:
     112        * UIProcess/API/Cocoa/_WKThumbnailView.h:
     113        * UIProcess/API/Cocoa/_WKUserContentExtensionStore.h:
     114        * UIProcess/API/Cocoa/_WKUserContentFilter.h:
     115        * UIProcess/API/Cocoa/_WKUserContentWorld.h:
     116        * UIProcess/API/Cocoa/_WKUserStyleSheet.h:
     117        * UIProcess/API/Cocoa/_WKVisitedLinkProvider.h:
     118        * UIProcess/API/Cocoa/_WKVisitedLinkStore.h:
     119        * UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
     120        * UIProcess/API/Cocoa/_WKWebsiteDataSize.h:
     121        * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
     122        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h:
     123        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h:
     124        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h:
     125        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h:
     126        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h:
     127        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h:
     128        * WebProcess/InjectedBundle/API/mac/WKDOMDocument.h:
     129        * WebProcess/InjectedBundle/API/mac/WKDOMElement.h:
     130        * WebProcess/InjectedBundle/API/mac/WKDOMNode.h:
     131        * WebProcess/InjectedBundle/API/mac/WKDOMRange.h:
     132        * WebProcess/InjectedBundle/API/mac/WKDOMText.h:
     133        * WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h:
     134        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h:
     135        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h:
     136
    11372016-07-01  Hunseop Jeong  <hs85.jeong@samsung.com>
    2138

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r197996 r202789  
    6060WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101000 = YES;
    6161WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101100 = YES;
     62
     63WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos9*] = YES;
     64WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator9*] = YES;

  • trunk/Source/WebKit2/Shared/API/Cocoa/WKBrowsingContextHandle.h

    r168566 r202789  
    2828#if WK_API_ENABLED
    2929
    30 WK_CLASS_AVAILABLE(10_10, 8_0)
     30WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3131@interface WKBrowsingContextHandle : NSObject <NSSecureCoding>
    3232@end

  • trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

    r202758 r202789  
    4343#ifndef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED
    4444
    45 #define WK_AVAILABLE(_mac, _ios)
    46 #define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility ("default")))
    47 #define WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
    48 #define WK_CLASS_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((visibility("default"))) __attribute__((deprecated(__VA_ARGS__)))
    49 #define WK_ENUM_AVAILABLE(_mac, _ios)
    50 #define WK_ENUM_AVAILABLE_IOS(_ios)
    51 #define WK_ENUM_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
     45#define WK_API_AVAILABLE(...)
     46#define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default"))) WK_API_AVAILABLE(__VA_ARGS__)
     47#define WK_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message)))
     48#define WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement)))
     49#define WK_CLASS_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((visibility("default"))) __attribute__((deprecated("use " #_replacement)))
    5250
    5351#endif

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h

    r168566 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface _WKFrameHandle : NSObject <NSCopying, NSSecureCoding>
    3434

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.h

    r190823 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(WK_MAC_TBA, NA)
     32WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA))
    3333@interface _WKHitTestResult : NSObject <NSCopying>
    3434

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h

    r192319 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface _WKRemoteObjectInterface : NSObject
    3434

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.h

    r168566 r202789  
    3232@class _WKRemoteObjectInterface;
    3333
    34 WK_CLASS_AVAILABLE(10_10, 8_0)
     34WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3535@interface _WKRemoteObjectRegistry : NSObject
    3636

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h

    r189547 r202789  
    3030typedef NS_OPTIONS(NSUInteger, _WKRenderingProgressEvents) {
    3131    _WKRenderingProgressEventFirstLayout = 1 << 0,
    32     _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(10_11, 9_0) = 1 << 1,
     32    _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_API_AVAILABLE(macosx(10.11), ios(9.0)) = 1 << 1,
    3333    _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
    34     _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(10_11, 9_0) = 1 << 3,
    35     _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(10_11, 9_0) = 1 << 4,
    36     _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(10_11, 9_0) = 1 << 5,
    37     _WKRenderingProgressEventFirstPaint WK_ENUM_AVAILABLE(10_11, 9_0) = 1 << 6,
    38 } WK_ENUM_AVAILABLE(10_10, 8_0);
     34    _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_API_AVAILABLE(macosx(10.11), ios(9.0)) = 1 << 3,
     35    _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering WK_API_AVAILABLE(macosx(10.11), ios(9.0)) = 1 << 4,
     36    _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering WK_API_AVAILABLE(macosx(10.11), ios(9.0)) = 1 << 5,
     37    _WKRenderingProgressEventFirstPaint WK_API_AVAILABLE(macosx(10.11), ios(9.0)) = 1 << 6,
     38} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    3939
    4040#endif

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKSameDocumentNavigationType.h

    r177362 r202789  
    3333    _WKSameDocumentNavigationTypeSessionStateReplace,
    3434    _WKSameDocumentNavigationTypeSessionStatePop,
    35 } WK_AVAILABLE(10_10, 8_0);
     35} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    3636
    3737#endif

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h

    r202758 r202789  
    3535NS_ASSUME_NONNULL_BEGIN
    3636
    37 WK_CLASS_AVAILABLE(10_10, 8_0)
     37WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3838@interface WKBackForwardList : NSObject
    3939

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h

    r198041 r202789  
    3434NS_ASSUME_NONNULL_BEGIN
    3535
    36 WK_CLASS_AVAILABLE(10_10, 8_0)
     36WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3737@interface WKBackForwardListItem : NSObject
    3838

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

    r177760 r202789  
    3737@protocol WKBrowsingContextPolicyDelegate;
    3838
    39 WK_CLASS_AVAILABLE(10_10, 8_0)
     39WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4040@interface WKBrowsingContextController : NSObject
    4141

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

    r169405 r202789  
    3131#import <WebKit/WKUserScriptInjectionTime.h>
    3232
    33 WK_CLASS_AVAILABLE(10_10, 8_0)
     33WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3434@interface WKBrowsingContextGroup : NSObject
    3535

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.h

    r168566 r202789  
    3939@end
    4040
    41 WK_CLASS_AVAILABLE(10_10, 8_0)
     41WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4242@interface WKConnection : NSObject
    4343

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h

    r195922 r202789  
    3333
    3434/*! @constant WKErrorDomain Indicates a WebKit error. */
    35 WK_EXTERN NSString * const WKErrorDomain WK_AVAILABLE(10_10, 8_0);
     35WK_EXTERN NSString * const WKErrorDomain WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    3636
    3737/*! @enum WKErrorCode
    … …  
    4848    WKErrorWebViewInvalidated,
    4949    WKErrorJavaScriptExceptionOccurred,
    50     WKErrorJavaScriptResultTypeIsUnsupported WK_ENUM_AVAILABLE(10_11, 9_0),
    51 } WK_ENUM_AVAILABLE(10_10, 8_0);
     50    WKErrorJavaScriptResultTypeIsUnsupported WK_API_AVAILABLE(macosx(10.11), ios(9.0)),
     51} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    5252
    5353NS_ASSUME_NONNULL_END

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorPrivate.h

    r191543 r202789  
    2828#if WK_API_ENABLED
    2929
    30 WK_EXTERN NSString * const _WKLegacyErrorDomain WK_AVAILABLE(10_11, 8_3);
     30WK_EXTERN NSString * const _WKLegacyErrorDomain WK_API_AVAILABLE(macosx(10.11), ios(8.3));
    3131
    3232typedef NS_ENUM(NSInteger, _WKLegacyErrorCode) {
    33     _WKErrorCodeFrameLoadInterruptedByPolicyChange WK_ENUM_AVAILABLE(10_11, 9_0) = 102,
     33    _WKErrorCodeFrameLoadInterruptedByPolicyChange WK_API_AVAILABLE(macosx(10.11), ios(9.0)) = 102,
    3434    _WKLegacyErrorPlugInWillHandleLoad = 204,
    35 } WK_ENUM_AVAILABLE(10_11, 8_3);
     35} WK_API_AVAILABLE(macosx(10.11), ios(8.3));
    3636
    3737/*! @constant _WKJavaScriptExceptionMessageErrorKey Key in userInfo representing
    3838 the exception message (as an NSString) for WKErrorJavaScriptExceptionOccurred errors. */
    39 WK_EXTERN NSString * const _WKJavaScriptExceptionMessageErrorKey WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     39WK_EXTERN NSString * const _WKJavaScriptExceptionMessageErrorKey WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4040
    4141/*! @constant _WKJavaScriptExceptionLineNumberErrorKey Key in userInfo representing
    4242 the exception line number (as an NSNumber) for WKErrorJavaScriptExceptionOccurred errors. */
    43 WK_EXTERN NSString * const _WKJavaScriptExceptionLineNumberErrorKey WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     43WK_EXTERN NSString * const _WKJavaScriptExceptionLineNumberErrorKey WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4444
    4545/*! @constant _WKJavaScriptExceptionColumnNumberErrorKey Key in userInfo representing
    4646 the exception column number (as an NSNumber) for WKErrorJavaScriptExceptionOccurred errors. */
    47 WK_EXTERN NSString * const _WKJavaScriptExceptionColumnNumberErrorKey WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     47WK_EXTERN NSString * const _WKJavaScriptExceptionColumnNumberErrorKey WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4848
    4949/*! @constant _WKJavaScriptExceptionSourceURLErrorKey Key in userInfo representing
    5050 the exception source URL (as an NSURL) for WKErrorJavaScriptExceptionOccurred errors. */
    51 WK_EXTERN NSString * const _WKJavaScriptExceptionSourceURLErrorKey WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     51WK_EXTERN NSString * const _WKJavaScriptExceptionSourceURLErrorKey WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5252
    5353#endif

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h

    r195922 r202789  
    3838NS_ASSUME_NONNULL_BEGIN
    3939
    40 WK_CLASS_AVAILABLE(10_10, 8_0)
     40WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4141@interface WKFrameInfo : NSObject <NSCopying>
    4242
    … …  
    5252/*! @abstract The frame's current security origin.
    5353 */
    54 @property (nonatomic, readonly) WKSecurityOrigin *securityOrigin WK_AVAILABLE(10_11, 9_0);
     54@property (nonatomic, readonly) WKSecurityOrigin *securityOrigin WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    5555
    5656@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoPrivate.h

    r191136 r202789  
    3232@interface WKFrameInfo (WKPrivate)
    3333
    34 @property (nonatomic, readonly, strong) _WKFrameHandle *_handle WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     34@property (nonatomic, readonly, strong) _WKFrameHandle *_handle WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    3535
    3636@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h

    r192481 r202789  
    3131#import <WebKit/WKDeclarationSpecifiers.h>
    3232
    33 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopy WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    34 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyImage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    35 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyLink WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    36 WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadImage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    37 WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    38 WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoBack WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    39 WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoForward WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    40 WK_EXPORT extern NSString * const _WKMenuItemIdentifierInspectElement WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    41 WK_EXPORT extern NSString * const _WKMenuItemIdentifierLookUp WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    42 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    43 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    44 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLink WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    45 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    46 WK_EXPORT extern NSString * const _WKMenuItemIdentifierPaste WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    47 WK_EXPORT extern NSString * const _WKMenuItemIdentifierReload WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    48 WK_EXPORT extern NSString * const _WKMenuItemIdentifierSearchWeb WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    49 WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    50 WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleFullScreen WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     33WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     34WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     35WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     36WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     37WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     38WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoBack WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     39WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoForward WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     40WK_EXPORT extern NSString * const _WKMenuItemIdentifierInspectElement WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     41WK_EXPORT extern NSString * const _WKMenuItemIdentifierLookUp WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     42WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     43WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     44WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLink WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     45WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     46WK_EXPORT extern NSString * const _WKMenuItemIdentifierPaste WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     47WK_EXPORT extern NSString * const _WKMenuItemIdentifierReload WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     48WK_EXPORT extern NSString * const _WKMenuItemIdentifierSearchWeb WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     49WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     50WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleFullScreen WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5151
    52 WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    53 WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpeechMenu WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     52WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     53WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpeechMenu WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5454
    5555#endif

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h

    r171626 r202789  
    3535 load from start to finish.
    3636 */
    37 WK_CLASS_AVAILABLE(10_10, 8_0)
     37WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3838@interface WKNavigation : NSObject
    3939

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h

    r195922 r202789  
    5454    WKNavigationTypeFormResubmitted,
    5555    WKNavigationTypeOther = -1,
    56 } WK_ENUM_AVAILABLE(10_10, 8_0);
     56} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    5757
    5858/*!
    5959A WKNavigationAction object contains information about an action that may cause a navigation, used for making policy decisions.
    6060 */
    61 WK_CLASS_AVAILABLE(10_10, 8_0)
     61WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    6262@interface WKNavigationAction : NSObject
    6363

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h

    r189547 r202789  
    3333@property (nonatomic, readonly, getter=_isUserInitiated) BOOL _userInitiated;
    3434@property (nonatomic, readonly) BOOL _canHandleRequest;
    35 @property (nonatomic, readonly) BOOL _shouldOpenExternalSchemes WK_AVAILABLE(10_11, 9_0);
    36 @property (nonatomic, readonly) BOOL _shouldOpenAppLinks WK_AVAILABLE(10_11, 9_0);
     35@property (nonatomic, readonly) BOOL _shouldOpenExternalSchemes WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     36@property (nonatomic, readonly) BOOL _shouldOpenAppLinks WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    3737
    38 @property (nonatomic, readonly) BOOL _shouldOpenExternalURLs WK_DEPRECATED(10_11, 10_11, 9_0, 9_0, "use _shouldOpenExternalSchemes and _shouldOpenAppLinks");
     38@property (nonatomic, readonly) BOOL _shouldOpenExternalURLs WK_API_DEPRECATED("use _shouldOpenExternalSchemes and _shouldOpenAppLinks", macosx(10.11, 10.11), ios(9.0, 9.0));
    3939
    4040@end

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

    r168566 r202789  
    3434#import <Foundation/Foundation.h>
    3535
    36 WK_CLASS_AVAILABLE(10_10, 8_0)
     36WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3737@interface WKNavigationData : NSObject
    3838

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h

    r202746 r202789  
    4646    WKNavigationActionPolicyCancel,
    4747    WKNavigationActionPolicyAllow,
    48 } WK_ENUM_AVAILABLE(10_10, 8_0);
     48} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    4949
    5050/*! @enum WKNavigationResponsePolicy
    … …  
    5656    WKNavigationResponsePolicyCancel,
    5757    WKNavigationResponsePolicyAllow,
    58 } WK_ENUM_AVAILABLE(10_10, 8_0);
     58} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    5959
    6060/*! A class conforming to the WKNavigationDelegate protocol can provide
    … …  
    143143 @param webView The web view whose underlying web content process was terminated.
    144144 */
    145 - (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView WK_AVAILABLE(10_11, 9_0);
     145- (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    146146
    147147@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h

    r191895 r202789  
    3333
    3434static const WKNavigationActionPolicy _WKNavigationActionPolicyDownload = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 1);
    35 static const WKNavigationActionPolicy WK_AVAILABLE(10_11, 9_0) _WKNavigationActionPolicyAllowWithoutTryingAppLink = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 2);
     35static const WKNavigationActionPolicy WK_API_AVAILABLE(macosx(10.11), ios(9.0)) _WKNavigationActionPolicyAllowWithoutTryingAppLink = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 2);
    3636
    3737static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownload = (WKNavigationResponsePolicy)(WKNavigationResponsePolicyAllow + 1);
    … …  
    6363- (void)_webViewWillEndNavigationGesture:(WKWebView *)webView withNavigationToBackForwardListItem:(WKBackForwardListItem *)item;
    6464- (void)_webView:(WKWebView *)webView willSnapshotBackForwardListItem:(WKBackForwardListItem *)item;
    65 - (void)_webViewDidRemoveNavigationGestureSnapshot:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     65- (void)_webViewDidRemoveNavigationGestureSnapshot:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6666
    6767#if TARGET_OS_IPHONE

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h

    r195922 r202789  
    3636/*! Contains information about a navigation response, used for making policy decisions.
    3737 */
    38 WK_CLASS_AVAILABLE(10_10, 8_0)
     38WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3939@interface WKNavigationResponse : NSObject
    4040

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.h

    r199558 r202789  
    3434/*! WKOpenPanelParameters contains parameters that a file upload control has specified.
    3535 */
    36 WK_CLASS_AVAILABLE(WK_MAC_TBA, NA)
     36WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA))
    3737@interface WKOpenPanelParameters : NSObject
    3838

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h

    r196987 r202789  
    3535 its web view configuration.
    3636 */
    37 WK_CLASS_AVAILABLE(10_10, 8_0)
     37WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3838@interface WKPreferences : NSObject <NSCoding>
    3939

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h

    r202758 r202789  
    3636    _WKStorageBlockingPolicyBlockThirdParty,
    3737    _WKStorageBlockingPolicyBlockAll,
    38 } WK_ENUM_AVAILABLE(10_10, 8_0);
     38} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    3939
    4040typedef NS_OPTIONS(NSUInteger, _WKDebugOverlayRegions) {
    4141    _WKNonFastScrollableRegion = 1 << 0,
    4242    _WKWheelEventHandlerRegion = 1 << 1
    43 } WK_ENUM_AVAILABLE(10_11, 9_0);
     43} WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4444
    4545typedef NS_OPTIONS(NSUInteger, _WKJavaScriptRuntimeFlags) {
    4646    _WKJavaScriptRuntimeFlagsAllEnabled = 0
    47 } WK_ENUM_AVAILABLE(10_11, 9_0);
     47} WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4848
    4949@class _WKExperimentalFeature;
    … …  
    5858@property (nonatomic, setter=_setCompositingRepaintCountersVisible:) BOOL _compositingRepaintCountersVisible;
    5959@property (nonatomic, setter=_setTiledScrollingIndicatorVisible:) BOOL _tiledScrollingIndicatorVisible;
    60 @property (nonatomic, setter=_setResourceUsageOverlayVisible:) BOOL _resourceUsageOverlayVisible WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    61 @property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_AVAILABLE(10_11, 9_0);
    62 @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_AVAILABLE(10_11, 9_0);
    63 @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    64 @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    65 @property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     60@property (nonatomic, setter=_setResourceUsageOverlayVisible:) BOOL _resourceUsageOverlayVisible WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     61@property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     62@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     63@property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     64@property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     65@property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6666
    67 @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_AVAILABLE(10_11, 9_0);
     67@property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    6868
    69 @property (nonatomic, setter=_setLogsPageMessagesToSystemConsoleEnabled:) BOOL _logsPageMessagesToSystemConsoleEnabled WK_AVAILABLE(10_11, 9_0);
     69@property (nonatomic, setter=_setLogsPageMessagesToSystemConsoleEnabled:) BOOL _logsPageMessagesToSystemConsoleEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    7070
    71 @property (nonatomic, setter=_setHiddenPageDOMTimerThrottlingEnabled:) BOOL _hiddenPageDOMTimerThrottlingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    72 @property (nonatomic, setter=_setHiddenPageDOMTimerThrottlingAutoIncreases:) BOOL _hiddenPageDOMTimerThrottlingAutoIncreases WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    73 @property (nonatomic, setter=_setPageVisibilityBasedProcessSuppressionEnabled:) BOOL _pageVisibilityBasedProcessSuppressionEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     71@property (nonatomic, setter=_setHiddenPageDOMTimerThrottlingEnabled:) BOOL _hiddenPageDOMTimerThrottlingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     72@property (nonatomic, setter=_setHiddenPageDOMTimerThrottlingAutoIncreases:) BOOL _hiddenPageDOMTimerThrottlingAutoIncreases WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     73@property (nonatomic, setter=_setPageVisibilityBasedProcessSuppressionEnabled:) BOOL _pageVisibilityBasedProcessSuppressionEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    7474
    75 @property (nonatomic, setter=_setAllowFileAccessFromFileURLs:) BOOL _allowFileAccessFromFileURLs WK_AVAILABLE(10_11, 9_0);
    76 @property (nonatomic, setter=_setJavaScriptRuntimeFlags:) _WKJavaScriptRuntimeFlags _javaScriptRuntimeFlags WK_AVAILABLE(10_11, 9_0);
     75@property (nonatomic, setter=_setAllowFileAccessFromFileURLs:) BOOL _allowFileAccessFromFileURLs WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     76@property (nonatomic, setter=_setJavaScriptRuntimeFlags:) _WKJavaScriptRuntimeFlags _javaScriptRuntimeFlags WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    7777
    78 @property (nonatomic, setter=_setStandalone:, getter=_isStandalone) BOOL _standalone WK_AVAILABLE(10_11, 9_0);
     78@property (nonatomic, setter=_setStandalone:, getter=_isStandalone) BOOL _standalone WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    7979
    80 @property (nonatomic, setter=_setDiagnosticLoggingEnabled:) BOOL _diagnosticLoggingEnabled WK_AVAILABLE(10_11, 9_0);
     80@property (nonatomic, setter=_setDiagnosticLoggingEnabled:) BOOL _diagnosticLoggingEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    8181
    82 @property (nonatomic, setter=_setDefaultFontSize:) NSUInteger _defaultFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    83 @property (nonatomic, setter=_setDefaultFixedPitchFontSize:) NSUInteger _defaultFixedPitchFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    84 @property (nonatomic, copy, setter=_setFixedPitchFontFamily:) NSString *_fixedPitchFontFamily WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     82@property (nonatomic, setter=_setDefaultFontSize:) NSUInteger _defaultFontSize WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     83@property (nonatomic, setter=_setDefaultFixedPitchFontSize:) NSUInteger _defaultFixedPitchFontSize WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     84@property (nonatomic, copy, setter=_setFixedPitchFontFamily:) NSString *_fixedPitchFontFamily WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    8585
    8686// FIXME: This should be configured on the WKWebsiteDataStore.
    8787// FIXME: This property should not have the verb "is" in it.
    8888@property (nonatomic, setter=_setOfflineApplicationCacheIsEnabled:) BOOL _offlineApplicationCacheIsEnabled;
    89 @property (nonatomic, setter=_setFullScreenEnabled:) BOOL _fullScreenEnabled WK_AVAILABLE(10_11, 9_0);
     89@property (nonatomic, setter=_setFullScreenEnabled:) BOOL _fullScreenEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    9090
    91 + (NSArray<_WKExperimentalFeature *> *)_experimentalFeatures WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    92 - (BOOL)_isEnabledForFeature:(_WKExperimentalFeature *)feature WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    93 - (void)_setEnabled:(BOOL)value forFeature:(_WKExperimentalFeature *)feature WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     91+ (NSArray<_WKExperimentalFeature *> *)_experimentalFeatures WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     92- (BOOL)_isEnabledForFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     93- (void)_setEnabled:(BOOL)value forFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    9494
    9595@end

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

    r198070 r202789  
    3030#import <UIKit/UIViewController.h>
    3131
    32 WK_AVAILABLE(NA, WK_IOS_TBA)
     32WK_API_AVAILABLE(ios(WK_IOS_TBA))
    3333@protocol WKPreviewActionItem <UIPreviewActionItem>
    3434

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

    r198070 r202789  
    3131#import <Foundation/Foundation.h>
    3232
    33 WK_EXTERN NSString * const WKPreviewActionItemIdentifierOpen WK_AVAILABLE(NA, WK_IOS_TBA);
    34 WK_EXTERN NSString * const WKPreviewActionItemIdentifierAddToReadingList WK_AVAILABLE(NA, WK_IOS_TBA);
    35 WK_EXTERN NSString * const WKPreviewActionItemIdentifierCopy WK_AVAILABLE(NA, WK_IOS_TBA);
    36 WK_EXTERN NSString * const WKPreviewActionItemIdentifierShare WK_AVAILABLE(NA, WK_IOS_TBA);
     33WK_EXTERN NSString * const WKPreviewActionItemIdentifierOpen WK_API_AVAILABLE(ios(WK_IOS_TBA));
     34WK_EXTERN NSString * const WKPreviewActionItemIdentifierAddToReadingList WK_API_AVAILABLE(ios(WK_IOS_TBA));
     35WK_EXTERN NSString * const WKPreviewActionItemIdentifierCopy WK_API_AVAILABLE(ios(WK_IOS_TBA));
     36WK_EXTERN NSString * const WKPreviewActionItemIdentifierShare WK_API_AVAILABLE(ios(WK_IOS_TBA));
    3737
    3838#endif

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

    r202638 r202789  
    3030NS_ASSUME_NONNULL_BEGIN
    3131
    32 WK_CLASS_AVAILABLE(NA, WK_IOS_TBA)
     32WK_CLASS_AVAILABLE(ios(WK_IOS_TBA))
    3333@interface WKPreviewElementInfo : NSObject <NSCopying>
    3434

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

    r168566 r202789  
    4444@end
    4545
    46 WK_CLASS_AVAILABLE(10_10, 8_0)
     46WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4747@interface WKProcessGroup : NSObject
    4848

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h

    r196997 r202789  
    3636 with the same process pool end up sharing web content processes.
    3737 */
    38 WK_CLASS_AVAILABLE(10_10, 8_0)
     38WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3939@interface WKProcessPool : NSObject <NSCoding>
    4040@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

    r197231 r202789  
    4444
    4545- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
    46 - (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value WK_AVAILABLE(10_11, 9_0);
     46- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4747- (void)_setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy;
    4848
    … …  
    5050- (void)_setObject:(id <NSCopying, NSSecureCoding>)object forBundleParameter:(NSString *)parameter;
    5151// FIXME: This should be NSDictionary<NSString *, id <NSCopying, NSSecureCoding>>
    52 - (void)_setObjectsForBundleParametersWithDictionary:(NSDictionary *)dictionary WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     52- (void)_setObjectsForBundleParametersWithDictionary:(NSDictionary *)dictionary WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5353
    5454@property (nonatomic, weak, setter=_setDownloadDelegate:) id <_WKDownloadDelegate> _downloadDelegate;
    55 @property (nonatomic, weak, setter=_setAutomationDelegate:) id <_WKAutomationDelegate> _automationDelegate WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     55@property (nonatomic, weak, setter=_setAutomationDelegate:) id <_WKAutomationDelegate> _automationDelegate WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5656
    5757+ (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL;
    5858+ (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL bundleIdentifierIfNotInContainer:(NSString *)bundleIdentifier;
    5959
    60 - (void)_warmInitialProcess WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    61 - (void)_automationCapabilitiesDidChange WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    62 - (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     60- (void)_warmInitialProcess WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     61- (void)_automationCapabilitiesDidChange WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     62- (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6363
    6464// Test only. Should be called only while no web content processes are running.

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h

    r195922 r202789  
    3838 a webpage.
    3939 */
    40 WK_CLASS_AVAILABLE(10_10, 8_0)
     40WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4141@interface WKScriptMessage : NSObject
    4242

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h

    r195963 r202789  
    3737NS_ASSUME_NONNULL_BEGIN
    3838
    39 WK_CLASS_AVAILABLE(10_11, 9_0)
     39WK_CLASS_AVAILABLE(macosx(10.11), ios(9.0))
    4040@interface WKSecurityOrigin : NSObject
    4141

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

    r168566 r202789  
    3131#import <WebKit/WKBase.h>
    3232
    33 WK_CLASS_AVAILABLE(10_10, 8_0)
     33WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3434@interface WKTypeRefWrapper : NSObject
    3535

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

    r202758 r202789  
    6666  the UI as needed, such as by closing the containing browser tab or window.
    6767  */
    68 - (void)webViewDidClose:(WKWebView *)webView WK_AVAILABLE(10_11, 9_0);
     68- (void)webViewDidClose:(WKWebView *)webView WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    6969
    7070/*! @abstract Displays a JavaScript alert panel.
    … …  
    130130 limited to links. In the future, it could be invoked for additional elements.
    131131 */
    132 - (BOOL)webView:(WKWebView *)webView shouldPreviewElement:(WKPreviewElementInfo *)elementInfo WK_AVAILABLE(NA, WK_IOS_TBA);
     132- (BOOL)webView:(WKWebView *)webView shouldPreviewElement:(WKPreviewElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
    133133
    134134/*! @abstract Allows your app to provide a custom view controller to show when the given element is peeked.
    … …  
    145145 if a non-nil view controller was returned.
    146146 */
    147 - (nullable UIViewController *)webView:(WKWebView *)webView previewingViewControllerForElement:(WKPreviewElementInfo *)elementInfo defaultActions:(NSArray<id <WKPreviewActionItem>> *)previewActions WK_AVAILABLE(NA, WK_IOS_TBA);
     147- (nullable UIViewController *)webView:(WKWebView *)webView previewingViewControllerForElement:(WKPreviewElementInfo *)elementInfo defaultActions:(NSArray<id <WKPreviewActionItem>> *)previewActions WK_API_AVAILABLE(ios(WK_IOS_TBA));
    148148
    149149/*! @abstract Allows your app to pop to the view controller it created.
    … …  
    151151 @param previewingViewController The view controller that is being popped.
    152152 */
    153 - (void)webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_AVAILABLE(NA, WK_IOS_TBA);
     153- (void)webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_API_AVAILABLE(ios(WK_IOS_TBA));
    154154
    155155#endif // TARGET_OS_IPHONE
    … …  
    165165 If you do not implement this method, the web view will behave as if the user selected the Cancel button.
    166166 */
    167 - (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSArray<NSURL *> * _Nullable URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
     167- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSArray<NSURL *> * _Nullable URLs))completionHandler WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    168168
    169169#endif

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

    r202758 r202789  
    5454- (void)_webViewClose:(WKWebView *)webView;
    5555- (void)_webViewFullscreenMayReturnToInline:(WKWebView *)webView;
    56 - (void)_webViewDidEnterFullscreen:(WKWebView *)webView WK_AVAILABLE(10_11, 8_3);
    57 - (void)_webViewDidExitFullscreen:(WKWebView *)webView WK_AVAILABLE(10_11, 8_3);
     56- (void)_webViewDidEnterFullscreen:(WKWebView *)webView WK_API_AVAILABLE(macosx(10.11), ios(8.3));
     57- (void)_webViewDidExitFullscreen:(WKWebView *)webView WK_API_AVAILABLE(macosx(10.11), ios(8.3));
    5858
    59 - (void)_webView:(WKWebView *)webView imageOrMediaDocumentSizeChanged:(CGSize)size WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    60 - (NSDictionary *)_dataDetectionContextForWebView:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     59- (void)_webView:(WKWebView *)webView imageOrMediaDocumentSizeChanged:(CGSize)size WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     60- (NSDictionary *)_dataDetectionContextForWebView:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6161#if TARGET_OS_IPHONE
    62 - (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, 9_0);
     62- (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(9_0));
    6363- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray<_WKElementAction *> *)defaultActions;
    6464- (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
    6565- (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
    66 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_AVAILABLE(NA, 9_0);
    67 - (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController WK_AVAILABLE(NA, 9_0);
    68 - (void)_webView:(WKWebView *)webView willPreviewImageWithURL:(NSURL *)imageURL WK_AVAILABLE(NA, 9_0);
    69 - (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_AVAILABLE(NA, 9_0);
    70 - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_AVAILABLE(NA, 9_0);
    71 - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_AVAILABLE(NA, 9_0);
    72 - (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
    73 - (void)_webView:(WKWebView *)webView alternateActionForURL:(NSURL *)url WK_AVAILABLE(NA, WK_IOS_TBA);
    74 - (NSArray *)_attachmentListForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA);
    75 - (NSUInteger)_webView:(WKWebView *)webView indexIntoAttachmentListForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
    76 - (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset WK_AVAILABLE(NA, 9_0);
    77 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_AVAILABLE(NA, 9_0);
    78 - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_AVAILABLE(NA, 9_0);
    79 - (UIViewController *)_presentingViewControllerForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA);
     66- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_API_AVAILABLE(ios(9_0));
     67- (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController WK_API_AVAILABLE(ios(9_0));
     68- (void)_webView:(WKWebView *)webView willPreviewImageWithURL:(NSURL *)imageURL WK_API_AVAILABLE(ios(9_0));
     69- (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_API_AVAILABLE(ios(9_0));
     70- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_API_AVAILABLE(ios(9_0));
     71- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_API_AVAILABLE(ios(9_0));
     72- (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(WK_IOS_TBA));
     73- (void)_webView:(WKWebView *)webView alternateActionForURL:(NSURL *)url WK_API_AVAILABLE(ios(WK_IOS_TBA));
     74- (NSArray *)_attachmentListForWebView:(WKWebView *)webView WK_API_AVAILABLE(ios(WK_IOS_TBA));
     75- (NSUInteger)_webView:(WKWebView *)webView indexIntoAttachmentListForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(WK_IOS_TBA));
     76- (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset WK_API_AVAILABLE(ios(9_0));
     77- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_AVAILABLE(ios(9_0));
     78- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_API_AVAILABLE(ios(9_0));
     79- (UIViewController *)_presentingViewControllerForWebView:(WKWebView *)webView WK_API_AVAILABLE(ios(WK_IOS_TBA));
    8080#else
    81 - (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element WK_AVAILABLE(WK_MAC_TBA, NA);
    82 - (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element userInfo:(id <NSSecureCoding>)userInfo WK_AVAILABLE(WK_MAC_TBA, NA);
     81- (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element WK_API_AVAILABLE(macosx(WK_MAC_TBA));
     82- (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element userInfo:(id <NSSecureCoding>)userInfo WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    8383#endif
    8484

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h

    r202758 r202789  
    4040 web view configuration.
    4141 */
    42 WK_CLASS_AVAILABLE(10_10, 8_0)
     42WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4343@interface WKUserContentController : NSObject <NSCoding>
    4444

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h

    r202758 r202789  
    3535@interface WKUserContentController (WKPrivate)
    3636
    37 - (void)_removeUserScript:(WKUserScript *)userScript WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    38 - (void)_removeAllUserScriptsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     37- (void)_removeUserScript:(WKUserScript *)userScript WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     38- (void)_removeAllUserScriptsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    3939
    40 - (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_AVAILABLE(10_11, 9_0);
    41 - (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0);
    42 - (void)_removeAllUserContentFilters WK_AVAILABLE(10_11, 9_0);
     40- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     41- (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     42- (void)_removeAllUserContentFilters WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4343
    44 @property (nonatomic, readonly, copy) NSArray<_WKUserStyleSheet *> *_userStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    45 - (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    46 - (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    47 - (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    48 - (void)_removeAllUserStyleSheetsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     44@property (nonatomic, readonly, copy) NSArray<_WKUserStyleSheet *> *_userStyleSheets WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     45- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     46- (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     47- (void)_removeAllUserStyleSheets WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     48- (void)_removeAllUserStyleSheetsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4949
    5050- (void)_addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name userContentWorld:(_WKUserContentWorld *)userContentWorld;

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h

    r195922 r202789  
    4040    WKUserScriptInjectionTimeAtDocumentStart,
    4141    WKUserScriptInjectionTimeAtDocumentEnd
    42 } WK_ENUM_AVAILABLE(10_10, 8_0);
     42} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    4343
    4444/*! A @link WKUserScript @/link object represents a script that can be injected into webpages.
    4545 */
    46 WK_CLASS_AVAILABLE(10_10, 8_0)
     46WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4747@interface WKUserScript : NSObject <NSCopying>
    4848

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h

    r202758 r202789  
    3434@interface WKUserScript (WKPrivate)
    3535
    36 - (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    37 - (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist associatedURL:(NSURL *)associatedURL userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     36- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     37- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist associatedURL:(NSURL *)associatedURL userContentWorld:(_WKUserContentWorld *)userContentWorld WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    3838
    39 @property (nonatomic, readonly) _WKUserContentWorld *_userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     39@property (nonatomic, readonly) _WKUserContentWorld *_userContentWorld WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4040
    4141@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

    r201298 r202789  
    7777@property (nonatomic, setter=_setViewScale:) CGFloat _viewScale;
    7878
    79 @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(10_11, NA);
     79@property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_API_AVAILABLE(macosx(10.11));
    8080
    8181@property (nonatomic, setter=_setAutomaticallyAdjustsContentInsets:) BOOL _automaticallyAdjustsContentInsets;
    … …  
    8585
    8686#if WK_API_ENABLED
    87 @property (strong, nonatomic, setter=_setInspectorAttachmentView:) NSView *_inspectorAttachmentView WK_AVAILABLE(10_11, NA);
     87@property (strong, nonatomic, setter=_setInspectorAttachmentView:) NSView *_inspectorAttachmentView WK_API_AVAILABLE(macosx(10.11));
    8888#endif
    8989

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

    r202746 r202789  
    5050 */
    5151#if TARGET_OS_IPHONE
    52 WK_CLASS_AVAILABLE(10_10, 8_0)
     52WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    5353@interface WKWebView : UIView
    5454#else
    55 WK_CLASS_AVAILABLE(10_10, 8_0)
     55WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    5656@interface WKWebView : NSView
    5757#endif
    … …  
    9999 @result A new navigation for the given file URL.
    100100 */
    101 - (nullable WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(10_11, 9_0);
     101- (nullable WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    102102
    103103/*! @abstract Sets the webpage contents and base URL.
    … …  
    115115 @result A new navigation.
    116116 */
    117 - (nullable WKNavigation *)loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL WK_AVAILABLE(10_11, 9_0);
     117- (nullable WKNavigation *)loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    118118
    119119/*! @abstract Navigates to an item from the back-forward list and sets it
    … …  
    169169 for this property.
    170170 */
    171 @property (nonatomic, readonly, nullable) SecTrustRef serverTrust WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     171@property (nonatomic, readonly, nullable) SecTrustRef serverTrust WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    172172
    173173/*! @abstract A Boolean value indicating whether there is a back item in
    … …  
    229229/*! @abstract The custom user agent string or nil if no custom user agent string has been set.
    230230*/
    231 @property (nullable, nonatomic, copy) NSString *customUserAgent WK_AVAILABLE(10_11, 9_0);
     231@property (nullable, nonatomic, copy) NSString *customUserAgent WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    232232
    233233/*! @abstract A Boolean value indicating whether link preview is allowed for any
    … …  
    235235 @discussion The default value is YES on Mac and iOS.
    236236 */
    237 @property (nonatomic) BOOL allowsLinkPreview WK_AVAILABLE(10_11, 9_0);
     237@property (nonatomic) BOOL allowsLinkPreview WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    238238
    239239#if TARGET_OS_IPHONE
    … …  
    307307@interface WKWebView (WKDeprecated)
    308308
    309 @property (nonatomic, readonly, copy) NSArray *certificateChain WK_DEPRECATED(10_11, WK_MAC_TBA, 9_0, WK_IOS_TBA, "Please use serverTrust");
     309@property (nonatomic, readonly, copy) NSArray *certificateChain WK_API_DEPRECATED_WITH_REPLACEMENT("serverTrust", macosx(10.11, WK_MAC_TBA), ios(9.0, WK_IOS_TBA));
    310310
    311311@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h

    r200951 r202789  
    5050    WKSelectionGranularityDynamic,
    5151    WKSelectionGranularityCharacter,
    52 } WK_ENUM_AVAILABLE_IOS(8_0);
     52} WK_API_AVAILABLE(ios(8.0));
    5353
    5454/*! @enum WKDataDetectorTypes
    … …  
    7373    WKDataDetectorTypeAll = NSUIntegerMax,
    7474
    75     WKDataDetectorTypeSpotlightSuggestion WK_ENUM_DEPRECATED(NA, NA, WK_IOS_TBA, WK_IOS_TBA, "Please use WKDataDetectorTypeLookupSuggestion") = WKDataDetectorTypeLookupSuggestion,
    76 } WK_ENUM_AVAILABLE(NA, WK_IOS_TBA);
     75    WKDataDetectorTypeSpotlightSuggestion WK_API_DEPRECATED_WITH_REPLACEMENT("WKDataDetectorTypeLookupSuggestion", ios(WK_IOS_TBA, WK_IOS_TBA)) = WKDataDetectorTypeLookupSuggestion,
     76} WK_API_AVAILABLE(ios(WK_IOS_TBA));
    7777
    7878#else
    … …  
    9292    WKUserInterfaceDirectionPolicyContent,
    9393    WKUserInterfaceDirectionPolicySystem,
    94 } WK_ENUM_AVAILABLE(WK_MAC_TBA, NA);
     94} WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    9595
    9696#endif
    … …  
    108108    WKAudiovisualMediaTypeVideo = 1 << 1,
    109109    WKAudiovisualMediaTypeAll = NSUIntegerMax
    110 } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     110} WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    111111
    112112/*! A WKWebViewConfiguration object is a collection of properties with
    … …  
    114114 @helps Contains properties used to configure a @link WKWebView @/link.
    115115 */
    116 WK_CLASS_AVAILABLE(10_10, 8_0)
     116WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    117117@interface WKWebViewConfiguration : NSObject <NSCoding, NSCopying>
    118118
    … …  
    135135/*! @abstract The website data store to be used by the web view.
    136136 */
    137 @property (nonatomic, strong) WKWebsiteDataStore *websiteDataStore WK_AVAILABLE(10_11, 9_0);
     137@property (nonatomic, strong) WKWebsiteDataStore *websiteDataStore WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    138138
    139139/*! @abstract A Boolean value indicating whether the web view suppresses
    … …  
    145145/*! @abstract The name of the application as used in the user agent string.
    146146*/
    147 @property (nullable, nonatomic, copy) NSString *applicationNameForUserAgent WK_AVAILABLE(10_11, 9_0);
     147@property (nullable, nonatomic, copy) NSString *applicationNameForUserAgent WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    148148
    149149/*! @abstract A Boolean value indicating whether AirPlay is allowed.
    150150 @discussion The default value is YES.
    151151 */
    152 @property (nonatomic) BOOL allowsAirPlayForMediaPlayback WK_AVAILABLE(10_11, 9_0);
    153 
    154 @property (nonatomic) WKAudiovisualMediaTypes mediaTypesRequiringUserActionForPlayback WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     152@property (nonatomic) BOOL allowsAirPlayForMediaPlayback WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     153
     154@property (nonatomic) WKAudiovisualMediaTypes mediaTypesRequiringUserActionForPlayback WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    155155
    156156#if TARGET_OS_IPHONE
    … …  
    172172 @discussion The default value is YES.
    173173 */
    174 @property (nonatomic) BOOL allowsPictureInPictureMediaPlayback WK_AVAILABLE(NA, 9_0);
     174@property (nonatomic) BOOL allowsPictureInPictureMediaPlayback WK_API_AVAILABLE(ios(9_0));
    175175
    176176/*! @abstract An enum value indicating the type of data detection desired.
    … …  
    181181
    182182 */
    183 @property (nonatomic) WKDataDetectorTypes dataDetectorTypes WK_AVAILABLE(NA, WK_IOS_TBA);
     183@property (nonatomic) WKDataDetectorTypes dataDetectorTypes WK_API_AVAILABLE(ios(WK_IOS_TBA));
    184184
    185185#else
    … …  
    189189 The default value is WKUserInterfaceDirectionPolicyContent.
    190190 */
    191 @property (nonatomic) WKUserInterfaceDirectionPolicy userInterfaceDirectionPolicy WK_AVAILABLE(WK_MAC_TBA, NA);
     191@property (nonatomic) WKUserInterfaceDirectionPolicy userInterfaceDirectionPolicy WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    192192
    193193#endif
    … …  
    198198
    199199#if TARGET_OS_IPHONE
    200 @property (nonatomic) BOOL mediaPlaybackRequiresUserAction WK_DEPRECATED(NA, NA, 8_0, 9_0, "Please use requiresUserActionForMediaPlayback");
    201 @property (nonatomic) BOOL mediaPlaybackAllowsAirPlay WK_DEPRECATED(NA, NA, 8_0, 9_0, "Please use allowsAirPlayForMediaPlayback");
    202 @property (nonatomic) BOOL requiresUserActionForMediaPlayback WK_DEPRECATED(NA, NA, 9_0, 10_0, "Please use mediaTypesRequiringUserActionForPlayback");
     200@property (nonatomic) BOOL mediaPlaybackRequiresUserAction WK_API_DEPRECATED_WITH_REPLACEMENT("requiresUserActionForMediaPlayback", ios(8.0, 9.0));
     201@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay WK_API_DEPRECATED_WITH_REPLACEMENT("allowsAirPlayForMediaPlayback", ios(8.0, 9.0));
     202@property (nonatomic) BOOL requiresUserActionForMediaPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", ios(9.0, WK_IOS_TBA));
    203203#endif
    204204

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

    r202444 r202789  
    4242@property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
    4343
    44 @property (nonatomic, setter=_setTreatsSHA1SignedCertificatesAsInsecure:) BOOL _treatsSHA1SignedCertificatesAsInsecure WK_AVAILABLE(NA, 9_0);
     44@property (nonatomic, setter=_setTreatsSHA1SignedCertificatesAsInsecure:) BOOL _treatsSHA1SignedCertificatesAsInsecure WK_API_AVAILABLE(ios(9_0));
    4545
    46 @property (nonatomic, setter=_setRespectsImageOrientation:) BOOL _respectsImageOrientation WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    47 @property (nonatomic, setter=_setPrintsBackgrounds:) BOOL _printsBackgrounds WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    48 @property (nonatomic, setter=_setIncrementalRenderingSuppressionTimeout:) CGFloat _incrementalRenderingSuppressionTimeout WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    49 @property (nonatomic, setter=_setAllowsJavaScriptMarkup:) BOOL _allowsJavaScriptMarkup WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    50 @property (nonatomic, setter=_setConvertsPositionStyleOnCopy:) BOOL _convertsPositionStyleOnCopy WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    51 @property (nonatomic, setter=_setAllowsMetaRefresh:) BOOL _allowsMetaRefresh WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    52 @property (nonatomic, setter=_setAllowUniversalAccessFromFileURLs:) BOOL _allowUniversalAccessFromFileURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    53 @property (nonatomic, setter=_setMainContentUserGestureOverrideEnabled:) BOOL _mainContentUserGestureOverrideEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    54 @property (nonatomic, setter=_setInvisibleAutoplayNotPermitted:) BOOL _invisibleAutoplayNotPermitted WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    55 @property (nonatomic, setter=_setMediaDataLoadsAutomatically:) BOOL _mediaDataLoadsAutomatically WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    56 @property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    57 @property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    58 @property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     46@property (nonatomic, setter=_setRespectsImageOrientation:) BOOL _respectsImageOrientation WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     47@property (nonatomic, setter=_setPrintsBackgrounds:) BOOL _printsBackgrounds WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     48@property (nonatomic, setter=_setIncrementalRenderingSuppressionTimeout:) CGFloat _incrementalRenderingSuppressionTimeout WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     49@property (nonatomic, setter=_setAllowsJavaScriptMarkup:) BOOL _allowsJavaScriptMarkup WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     50@property (nonatomic, setter=_setConvertsPositionStyleOnCopy:) BOOL _convertsPositionStyleOnCopy WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     51@property (nonatomic, setter=_setAllowsMetaRefresh:) BOOL _allowsMetaRefresh WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     52@property (nonatomic, setter=_setAllowUniversalAccessFromFileURLs:) BOOL _allowUniversalAccessFromFileURLs WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     53@property (nonatomic, setter=_setMainContentUserGestureOverrideEnabled:) BOOL _mainContentUserGestureOverrideEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     54@property (nonatomic, setter=_setInvisibleAutoplayNotPermitted:) BOOL _invisibleAutoplayNotPermitted WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     55@property (nonatomic, setter=_setMediaDataLoadsAutomatically:) BOOL _mediaDataLoadsAutomatically WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     56@property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     57@property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     58@property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5959
    6060#if TARGET_OS_IPHONE
    61 @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_AVAILABLE(NA, 9_0);
    62 @property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_AVAILABLE(NA, WK_IOS_TBA);
    63 @property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen  WK_AVAILABLE(NA, WK_IOS_TBA);
     61@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
     62@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
     63@property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen  WK_API_AVAILABLE(ios(WK_IOS_TBA));
    6464#else
    65 @property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_AVAILABLE(WK_MAC_TBA, NA);
    66 @property (nonatomic, setter=_setServiceControlsEnabled:) BOOL _serviceControlsEnabled WK_AVAILABLE(WK_MAC_TBA, NA);
    67 @property (nonatomic, setter=_setImageControlsEnabled:) BOOL _imageControlsEnabled WK_AVAILABLE(WK_MAC_TBA, NA);
    68 @property (nonatomic, readwrite, setter=_setRequiresUserActionForEditingControlsManager:) BOOL _requiresUserActionForEditingControlsManager WK_AVAILABLE(WK_MAC_TBA, NA);
     65@property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(WK_MAC_TBA));
     66@property (nonatomic, setter=_setServiceControlsEnabled:) BOOL _serviceControlsEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
     67@property (nonatomic, setter=_setImageControlsEnabled:) BOOL _imageControlsEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
     68@property (nonatomic, readwrite, setter=_setRequiresUserActionForEditingControlsManager:) BOOL _requiresUserActionForEditingControlsManager WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    6969#endif
    7070
    71 @property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use _visitedLinkStore instead");
     71@property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider WK_API_DEPRECATED_WITH_REPLACEMENT("_visitedLinkStore", macosx(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
    7272
    73 @property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_DEPRECATED(10_10, 10_11, 8_0, 9_0, "Please use websiteDataStore instead");
    74 @property (nonatomic, setter=_setRequiresUserActionForAudioPlayback:) BOOL _requiresUserActionForAudioPlayback WK_DEPRECATED(WK_MAC_TBA, WK_MAC_TBA, WK_IOS_TBA, WK_IOS_TBA, "Please use mediaTypesRequiringUserActionForPlayback");
    75 @property (nonatomic, setter=_setRequiresUserActionForVideoPlayback:) BOOL _requiresUserActionForVideoPlayback WK_DEPRECATED(WK_MAC_TBA, WK_MAC_TBA, WK_IOS_TBA, WK_IOS_TBA, "Please use mediaTypesRequiringUserActionForPlayback");
     73@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_API_DEPRECATED_WITH_REPLACEMENT("websiteDataStore", macosx(10.10, 10.11), ios(8.0, 9.0));
     74@property (nonatomic, setter=_setRequiresUserActionForAudioPlayback:) BOOL _requiresUserActionForAudioPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
     75@property (nonatomic, setter=_setRequiresUserActionForVideoPlayback:) BOOL _requiresUserActionForVideoPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
    7676
    7777@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r202132 r202789  
    3838    _WKPaginationModeTopToBottom,
    3939    _WKPaginationModeBottomToTop,
    40 } WK_ENUM_AVAILABLE(10_10, 8_0);
     40} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    4141
    4242typedef NS_ENUM(NSInteger, _WKImmediateActionType) {
    … …  
    4747    _WKImmediateActionMailtoLink,
    4848    _WKImmediateActionTelLink
    49 } WK_AVAILABLE(WK_MAC_TBA, NA);
     49} WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    5050
    5151@class WKBrowsingContextHandle;
    … …  
    7575
    7676- (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
    77 - (WKNavigation *)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL userData:(id)userData WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    78 
    79 @property (nonatomic, readonly) NSArray *_certificateChain WK_DEPRECATED(10_10, 10_11, 8_0, 9_0, "use -certificateChain");
     77- (WKNavigation *)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL userData:(id)userData WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     78
     79@property (nonatomic, readonly) NSArray *_certificateChain WK_API_DEPRECATED_WITH_REPLACEMENT("certificateChain", macosx(10.10, 10.11), ios(8.0, 9.0));
    8080@property (nonatomic, readonly) NSURL *_committedURL;
    8181@property (nonatomic, readonly) NSString *_MIMEType;
    82 @property (nonatomic, readonly) NSString *_userAgent WK_AVAILABLE(10_11, 9_0);
     82@property (nonatomic, readonly) NSString *_userAgent WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    8383
    8484@property (copy, setter=_setApplicationNameForUserAgent:) NSString *_applicationNameForUserAgent;
    8585@property (copy, setter=_setCustomUserAgent:) NSString *_customUserAgent;
    8686
    87 @property (nonatomic, setter=_setUserContentExtensionsEnabled:) BOOL _userContentExtensionsEnabled WK_AVAILABLE(10_11, 9_0);
     87@property (nonatomic, setter=_setUserContentExtensionsEnabled:) BOOL _userContentExtensionsEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    8888
    8989@property (nonatomic, readonly) pid_t _webProcessIdentifier;
    9090
    91 @property (nonatomic, getter=_isEditable, setter=_setEditable:) BOOL _editable WK_AVAILABLE(10_11, 9_0);
     91@property (nonatomic, getter=_isEditable, setter=_setEditable:) BOOL _editable WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    9292
    9393// FIXME: Remove these once nobody is using them.
    … …  
    9999
    100100@property (nonatomic, setter=_setAllowsRemoteInspection:) BOOL _allowsRemoteInspection;
    101 @property (nonatomic, copy, setter=_setRemoteInspectionNameOverride:) NSString *_remoteInspectionNameOverride WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     101@property (nonatomic, copy, setter=_setRemoteInspectionNameOverride:) NSString *_remoteInspectionNameOverride WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    102102
    103103@property (nonatomic, setter=_setAddsVisitedLinks:) BOOL _addsVisitedLinks;
    … …  
    153153// Deprecated: Use [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:] instead.
    154154// This function is kept for binary compatibility with iOS 8.0, it can be removed after the bincompat window.
    155 - (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_DEPRECATED(NA, NA, 8_0, 9_0, "use -_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:");
    156 
    157 - (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_AVAILABLE(NA, 9_0);
     155- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_API_DEPRECATED_WITH_REPLACEMENT("-_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:", ios(8.0, 9.0));
     156
     157- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_API_AVAILABLE(ios(9_0));
    158158
    159159- (UIView *)_viewForFindUI;
    … …  
    166166// Puts the view into a state where being taken out of the view hierarchy and resigning first responder
    167167// will not count as becoming inactive and unfocused. The returned block must be called to exit the state.
    168 - (void (^)(void))_retainActiveFocusedState WK_AVAILABLE(NA, 9_0);
    169 
    170 - (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler WK_AVAILABLE(NA, 9_0);
    171 
    172 - (id)_snapshotLayerContentsForBackForwardListItem:(WKBackForwardListItem *)item WK_AVAILABLE(NA, 9_0);
     168- (void (^)(void))_retainActiveFocusedState WK_API_AVAILABLE(ios(9_0));
     169
     170- (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler WK_API_AVAILABLE(ios(9_0));
     171
     172- (id)_snapshotLayerContentsForBackForwardListItem:(WKBackForwardListItem *)item WK_API_AVAILABLE(ios(9_0));
    173173- (NSArray *)_dataDetectionResults;
    174174
    … …  
    181181
    182182// Default value is 0. A value of 0 means the window's backing scale factor will be used and automatically update when the window moves screens.
    183 @property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_AVAILABLE(10_11, NA);
     183@property (nonatomic, setter=_setOverrideDeviceScaleFactor:) CGFloat _overrideDeviceScaleFactor WK_API_AVAILABLE(macosx(10.11));
    184184
    185185@property (nonatomic, setter=_setWindowOcclusionDetectionEnabled:) BOOL _windowOcclusionDetectionEnabled;
    … …  
    189189- (id)_immediateActionAnimationControllerForHitTestResult:(_WKHitTestResult *)hitTestResult withType:(_WKImmediateActionType)type userData:(id<NSSecureCoding>)userData;
    190190
    191 @property (nonatomic, setter=_setMinimumLayoutWidth:) CGFloat _minimumLayoutWidth WK_AVAILABLE(WK_MAC_TBA, NA);
     191@property (nonatomic, setter=_setMinimumLayoutWidth:) CGFloat _minimumLayoutWidth WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    192192
    193193// When using _minimumLayoutWidth, the web content will lay out to the intrinsic height
    194194// of the content; use this property to force it to lay out to the height of the view instead.
    195 @property (nonatomic, setter=_setShouldExpandContentToViewHeightForAutoLayout:) BOOL _shouldExpandContentToViewHeightForAutoLayout WK_AVAILABLE(WK_MAC_TBA, NA);
     195@property (nonatomic, setter=_setShouldExpandContentToViewHeightForAutoLayout:) BOOL _shouldExpandContentToViewHeightForAutoLayout WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    196196
    197197- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo;
    198 - (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(_WKFrameHandle *)frameHandle WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    199 
    200 #endif
    201 
    202 - (WKNavigation *)_reloadWithoutContentBlockers WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     198- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(_WKFrameHandle *)frameHandle WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     199
     200#endif
     201
     202- (WKNavigation *)_reloadWithoutContentBlockers WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    203203
    204204- (void)_killWebContentProcessAndResetState;
    … …  
    221221@property (nonatomic, setter=_setPageZoomFactor:) double _pageZoomFactor;
    222222
    223 @property (nonatomic, weak, setter=_setDiagnosticLoggingDelegate:) id <_WKDiagnosticLoggingDelegate> _diagnosticLoggingDelegate WK_AVAILABLE(10_11, 9_0);
     223@property (nonatomic, weak, setter=_setDiagnosticLoggingDelegate:) id <_WKDiagnosticLoggingDelegate> _diagnosticLoggingDelegate WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    224224@property (nonatomic, weak, setter=_setFindDelegate:) id <_WKFindDelegate> _findDelegate;
    225225- (void)_findString:(NSString *)string options:(_WKFindOptions)options maxCount:(NSUInteger)maxCount;
    … …  
    227227- (void)_hideFindUI;
    228228
    229 @property (nonatomic, weak, setter=_setFormDelegate:) id <_WKFormDelegate> _formDelegate WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "use _inputDelegate");
    230 @property (nonatomic, weak, setter=_setInputDelegate:) id <_WKInputDelegate> _inputDelegate WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     229@property (nonatomic, weak, setter=_setFormDelegate:) id <_WKFormDelegate> _formDelegate WK_API_DEPRECATED_WITH_REPLACEMENT("_inputDelegate", macosx(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
     230@property (nonatomic, weak, setter=_setInputDelegate:) id <_WKInputDelegate> _inputDelegate WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    231231
    232232@property (nonatomic, readonly, getter=_isDisplayingStandaloneImageDocument) BOOL _displayingStandaloneImageDocument;
    233233@property (nonatomic, readonly, getter=_isDisplayingStandaloneMediaDocument) BOOL _displayingStandaloneMediaDocument;
    234234
    235 @property (nonatomic, setter=_setScrollPerformanceDataCollectionEnabled:) BOOL _scrollPerformanceDataCollectionEnabled WK_AVAILABLE(10_11, 9_0);
    236 @property (nonatomic, readonly) NSArray *_scrollPerformanceData WK_AVAILABLE(10_11, 9_0);
    237 
    238 - (void)_saveBackForwardSnapshotForItem:(WKBackForwardListItem *)item WK_AVAILABLE(10_11, 9_0);
     235@property (nonatomic, setter=_setScrollPerformanceDataCollectionEnabled:) BOOL _scrollPerformanceDataCollectionEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     236@property (nonatomic, readonly) NSArray *_scrollPerformanceData WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     237
     238- (void)_saveBackForwardSnapshotForItem:(WKBackForwardListItem *)item WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    239239
    240240@property (nonatomic, getter=_allowsMediaDocumentInlinePlayback, setter=_setAllowsMediaDocumentInlinePlayback:) BOOL _allowsMediaDocumentInlinePlayback;
    241241
    242 @property (nonatomic, readonly) BOOL _webProcessIsResponsive WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     242@property (nonatomic, readonly) BOOL _webProcessIsResponsive WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    243243
    244244@end
    … …  
    252252
    253253#if TARGET_OS_IPHONE
    254 @property (nonatomic, readonly) CGRect _contentVisibleRect WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    255 - (CGPoint)_convertPointFromContentsToView:(CGPoint)point WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    256 - (CGPoint)_convertPointFromViewToContents:(CGPoint)point WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    257 
    258 - (void)keyboardAccessoryBarNext WK_AVAILABLE(NA, WK_IOS_TBA);
    259 - (void)keyboardAccessoryBarPrevious WK_AVAILABLE(NA, WK_IOS_TBA);
    260 
    261 @property (nonatomic) BOOL forceIPadStyleZoomOnInputFocus WK_AVAILABLE(NA, WK_IOS_TBA);
     254@property (nonatomic, readonly) CGRect _contentVisibleRect WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     255- (CGPoint)_convertPointFromContentsToView:(CGPoint)point WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     256- (CGPoint)_convertPointFromViewToContents:(CGPoint)point WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     257
     258- (void)keyboardAccessoryBarNext WK_API_AVAILABLE(ios(WK_IOS_TBA));
     259- (void)keyboardAccessoryBarPrevious WK_API_AVAILABLE(ios(WK_IOS_TBA));
     260
     261@property (nonatomic) BOOL forceIPadStyleZoomOnInputFocus WK_API_AVAILABLE(ios(WK_IOS_TBA));
    262262#endif
    263263
    264264#if !TARGET_OS_IPHONE
    265 @property (nonatomic, readonly) BOOL _hasActiveVideoForControlsManager WK_AVAILABLE(WK_MAC_TBA, NA);
    266 #endif
    267 
    268 - (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     265@property (nonatomic, readonly) BOOL _hasActiveVideoForControlsManager WK_API_AVAILABLE(macosx(WK_MAC_TBA));
     266#endif
     267
     268- (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    269269
    270270@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h

    r202758 r202789  
    3333
    3434/*! @constant WKWebsiteDataTypeDiskCache On-disk caches. */
    35 WK_EXTERN NSString * const WKWebsiteDataTypeDiskCache WK_AVAILABLE(10_11, 9_0);
     35WK_EXTERN NSString * const WKWebsiteDataTypeDiskCache WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    3636
    3737/*! @constant WKWebsiteDataTypeMemoryCache In-memory caches. */
    38 WK_EXTERN NSString * const WKWebsiteDataTypeMemoryCache WK_AVAILABLE(10_11, 9_0);
     38WK_EXTERN NSString * const WKWebsiteDataTypeMemoryCache WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    3939
    4040/*! @constant WKWebsiteDataTypeOfflineWebApplicationCache HTML offline web application caches. */
    41 WK_EXTERN NSString * const WKWebsiteDataTypeOfflineWebApplicationCache WK_AVAILABLE(10_11, 9_0);
     41WK_EXTERN NSString * const WKWebsiteDataTypeOfflineWebApplicationCache WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4242
    4343/*! @constant WKWebsiteDataTypeCookies Cookies. */
    44 WK_EXTERN NSString * const WKWebsiteDataTypeCookies WK_AVAILABLE(10_11, 9_0);
     44WK_EXTERN NSString * const WKWebsiteDataTypeCookies WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4545
    4646/*! @constant WKWebsiteDataTypeSessionStorage HTML session storage. */
    47 WK_EXTERN NSString * const WKWebsiteDataTypeSessionStorage WK_AVAILABLE(10_11, 9_0);
     47WK_EXTERN NSString * const WKWebsiteDataTypeSessionStorage WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4848
    4949/*! @constant WKWebsiteDataTypeLocalStorage HTML local storage. */
    50 WK_EXTERN NSString * const WKWebsiteDataTypeLocalStorage WK_AVAILABLE(10_11, 9_0);
     50WK_EXTERN NSString * const WKWebsiteDataTypeLocalStorage WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    5151
    5252/*! @constant WKWebsiteDataTypeWebSQLDatabases WebSQL databases. */
    53 WK_EXTERN NSString * const WKWebsiteDataTypeWebSQLDatabases WK_AVAILABLE(10_11, 9_0);
     53WK_EXTERN NSString * const WKWebsiteDataTypeWebSQLDatabases WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    5454
    5555/*! @constant WKWebsiteDataTypeIndexedDBDatabases IndexedDB databases. */
    56 WK_EXTERN NSString * const WKWebsiteDataTypeIndexedDBDatabases WK_AVAILABLE(10_11, 9_0);
     56WK_EXTERN NSString * const WKWebsiteDataTypeIndexedDBDatabases WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    5757
    5858/*! A WKWebsiteDataRecord represents website data, grouped by domain name using the public suffix list. */
    59 WK_CLASS_AVAILABLE(10_11, 9_0)
     59WK_CLASS_AVAILABLE(macosx(10.11), ios(9.0))
    6060@interface WKWebsiteDataRecord : NSObject
    6161

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h

    r197427 r202789  
    3232@class _WKWebsiteDataSize;
    3333
    34 WK_EXTERN NSString * const _WKWebsiteDataTypeHSTSCache WK_AVAILABLE(10_11, 9_0);
    35 WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(10_11, 9_0);
    36 WK_EXTERN NSString * const _WKWebsiteDataTypeSearchFieldRecentSearches WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    37 WK_EXTERN NSString * const _WKWebsiteDataTypeResourceLoadStatistics WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     34WK_EXTERN NSString * const _WKWebsiteDataTypeHSTSCache WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     35WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_API_AVAILABLE(macosx(10.11), ios(9.0));
     36WK_EXTERN NSString * const _WKWebsiteDataTypeSearchFieldRecentSearches WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     37WK_EXTERN NSString * const _WKWebsiteDataTypeResourceLoadStatistics WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    3838
    3939
    4040#if !TARGET_OS_IPHONE
    41 WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_AVAILABLE(10_11, NA);
     41WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_API_AVAILABLE(macosx(10.11));
    4242#endif
    4343

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h

    r202758 r202789  
    3636 IndexedDB databases, and local storage.
    3737 */
    38 WK_CLASS_AVAILABLE(10_11, 9_0)
     38WK_CLASS_AVAILABLE(macosx(10.11), ios(9.0))
    3939@interface WKWebsiteDataStore : NSObject <NSCoding>
    4040

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h

    r202758 r202789  
    3232typedef NS_OPTIONS(NSUInteger, _WKWebsiteDataStoreFetchOptions) {
    3333    _WKWebsiteDataStoreFetchOptionComputeSizes = 1 << 0,
    34 } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     34} WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    3535
    3636@interface WKWebsiteDataStore (WKPrivate)
    … …  
    3838- (void)_fetchDataRecordsOfTypes:(NSSet<NSString *> *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(NSArray<WKWebsiteDataRecord *> *))completionHandler;
    3939
    40 @property (nonatomic, setter=_setResourceLoadStatisticsEnabled:) BOOL _resourceLoadStatisticsEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     40@property (nonatomic, setter=_setResourceLoadStatisticsEnabled:) BOOL _resourceLoadStatisticsEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4141
    4242@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h

    r195922 r202789  
    3434NS_ASSUME_NONNULL_BEGIN
    3535
    36 WK_CLASS_AVAILABLE(10_10, 8_0)
     36WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3737@interface WKWindowFeatures : NSObject
    3838

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

    r198446 r202789  
    3737    _WKActivatedElementTypeLink,
    3838    _WKActivatedElementTypeImage,
    39     _WKActivatedElementTypeAttachment WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA),
    40 } WK_ENUM_AVAILABLE(10_10, 8_0);
     39    _WKActivatedElementTypeAttachment WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)),
     40} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    4141
    42 WK_CLASS_AVAILABLE(10_10, 8_0)
     42WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4343@interface _WKActivatedElementInfo : NSObject
    4444
    … …  
    4747@property (nonatomic, readonly) _WKActivatedElementType type;
    4848@property (nonatomic, readonly) CGRect boundingRect;
    49 @property (nonatomic, readonly) NSString *ID WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     49@property (nonatomic, readonly) NSString *ID WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5050#if TARGET_OS_IPHONE
    5151@property (nonatomic, readonly, copy) UIImage *image;

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKAutomationSession.h

    r200280 r202789  
    3434NS_ASSUME_NONNULL_BEGIN
    3535
    36 WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     36WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
    3737@interface _WKAutomationSession : NSObject
    3838

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKContextMenuElementInfo.h

    r202638 r202789  
    3030NS_ASSUME_NONNULL_BEGIN
    3131
    32 WK_CLASS_AVAILABLE(WK_MAC_TBA, NA)
     32WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA))
    3333@interface _WKContextMenuElementInfo : NSObject <NSCopying>
    3434

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h

    r189547 r202789  
    3434    _WKDiagnosticLoggingResultFail,
    3535    _WKDiagnosticLoggingResultNoop,
    36 } WK_ENUM_AVAILABLE(10_11, 9_0);
     36} WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    3737
    3838@protocol _WKDiagnosticLoggingDelegate <NSObject>

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h

    r168566 r202789  
    3232@class WKWebView;
    3333
    34 WK_CLASS_AVAILABLE(10_10, 8_0)
     34WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3535@interface _WKDownload : NSObject
    3636

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h

    r191809 r202789  
    4242#if !defined(TARGET_OS_IOS) || TARGET_OS_IOS
    4343    _WKElementActionTypeAddToReadingList,
    44     _WKElementActionTypeOpenInDefaultBrowser WK_ENUM_AVAILABLE(NA, 9_0),
    45     _WKElementActionTypeOpenInExternalApplication WK_ENUM_AVAILABLE(NA, 9_0),
     44    _WKElementActionTypeOpenInDefaultBrowser WK_API_AVAILABLE(ios(9_0)),
     45    _WKElementActionTypeOpenInExternalApplication WK_API_AVAILABLE(ios(9_0)),
    4646#endif
    47     _WKElementActionTypeShare WK_ENUM_AVAILABLE(NA, WK_IOS_TBA),
    48 } WK_ENUM_AVAILABLE(10_10, 8_0);
     47    _WKElementActionTypeShare WK_API_AVAILABLE(ios(WK_IOS_TBA)),
     48} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    4949
    50 WK_CLASS_AVAILABLE(10_10, 8_0)
     50WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    5151@interface _WKElementAction : NSObject
    5252
    … …  
    5656+ (instancetype)elementActionWithTitle:(NSString *)title actionHandler:(WKElementActionHandler)handler;
    5757
    58 - (void)runActionWithElementInfo:(_WKActivatedElementInfo *)info WK_AVAILABLE(NA, 9_0);
     58- (void)runActionWithElementInfo:(_WKActivatedElementInfo *)info WK_API_AVAILABLE(ios(9_0));
    5959
    6060@property (nonatomic, readonly) _WKElementActionType type;

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.h

    r199741 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     32WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
    3333@interface _WKExperimentalFeature : NSObject
    3434

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFindOptions.h

    r182085 r202789  
    4242    _WKFindOptionsIrrelevantForBatchResults = _WKFindOptionsBackwards | _WKFindOptionsWrapAround | _WKFindOptionsIrrelevantForIncrementalResults
    4343
    44 } WK_ENUM_AVAILABLE(10_10, 8_0);
     44} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
    4545
    4646#endif

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h

    r201347 r202789  
    3737@property (nonatomic, readonly, getter=isValid) BOOL valid;
    3838@property (nonatomic, readonly) NSObject <NSSecureCoding> *userObject;
    39 @property (nonatomic, readonly) id <_WKFocusedElementInfo> focusedElementInfo WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     39@property (nonatomic, readonly) id <_WKFocusedElementInfo> focusedElementInfo WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4040
    4141#if TARGET_OS_IPHONE
    4242@property (nonatomic, copy) NSString *accessoryViewCustomButtonTitle;
    43 @property (nonatomic, strong) UIView *customInputView WK_AVAILABLE(NA, WK_IOS_TBA);
    44 @property (nonatomic, copy) NSArray<UITextSuggestion *> *suggestions WK_AVAILABLE(NA, WK_IOS_TBA);
    45 @property (nonatomic) BOOL accessoryViewShouldNotShow WK_AVAILABLE(NA, WK_IOS_TBA);
    46 @property (nonatomic, copy) NSString *textContentType WK_AVAILABLE(NA, WK_IOS_TBA);
     43@property (nonatomic, strong) UIView *customInputView WK_API_AVAILABLE(ios(WK_IOS_TBA));
     44@property (nonatomic, copy) NSArray<UITextSuggestion *> *suggestions WK_API_AVAILABLE(ios(WK_IOS_TBA));
     45@property (nonatomic) BOOL accessoryViewShouldNotShow WK_API_AVAILABLE(ios(WK_IOS_TBA));
     46@property (nonatomic, copy) NSString *textContentType WK_API_AVAILABLE(ios(WK_IOS_TBA));
    4747#endif
    4848

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h

    r198046 r202789  
    4747- (BOOL)_webView:(WKWebView *)webView hasSuggestionsForCurrentStringInInputSession:(id <_WKFormInputSession>)inputSession;
    4848- (NSArray *)_webView:(WKWebView *)webView suggestionsForString:(NSString *)string inInputSession:(id <_WKFormInputSession>)inputSession;
    49 - (void)_webView:(WKWebView *)webView insertTextSuggestion:(UITextSuggestion *)suggestion inInputSession:(id <_WKFormInputSession>)inputSession WK_AVAILABLE(NA, WK_IOS_TBA);
     49- (void)_webView:(WKWebView *)webView insertTextSuggestion:(UITextSuggestion *)suggestion inInputSession:(id <_WKFormInputSession>)inputSession WK_API_AVAILABLE(ios(WK_IOS_TBA));
    5050#endif
    5151

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h

    r189547 r202789  
    3838    _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize = 4,
    3939
    40 } WK_ENUM_AVAILABLE(10_11, 9_0);
     40} WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4141
    4242#endif

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h

    r189547 r202789  
    3535    _WKOverlayScrollbarStyleAutomatic
    3636
    37 } WK_ENUM_AVAILABLE(10_11, 9_0);
     37} WK_API_AVAILABLE(macosx(10.11), ios(9.0));

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h

    r202758 r202789  
    2929#if WK_API_ENABLED
    3030
    31 WK_CLASS_AVAILABLE(10_10, 8_0)
     31WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3232@interface _WKProcessPoolConfiguration : NSObject <NSCopying>
    3333
    3434@property (nonatomic, copy) NSURL *injectedBundleURL;
    3535@property (nonatomic) NSUInteger maximumProcessCount;
    36 @property (nonatomic) NSInteger diskCacheSizeOverride WK_AVAILABLE(10_11, 9_0);
     36@property (nonatomic) NSInteger diskCacheSizeOverride WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    3737@property (nonatomic, copy) NSArray *cachePartitionedURLSchemes;
    38 @property (nonatomic, copy) NSArray<NSString *> *alwaysRevalidatedURLSchemes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    39 @property (nonatomic) BOOL diskCacheSpeculativeValidationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     38@property (nonatomic, copy) NSArray<NSString *> *alwaysRevalidatedURLSchemes WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     39@property (nonatomic) BOOL diskCacheSpeculativeValidationEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4040
    4141@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.h

    r170854 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface _WKSessionState : NSObject
    3434

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

    r201366 r202789  
    3434@class WKView;
    3535
    36 WK_CLASS_AVAILABLE(10_10, 8_0)
     36WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3737@interface _WKThumbnailView : NSView
    3838

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h

    r201457 r202789  
    3030@class _WKUserContentFilter;
    3131
    32 WK_CLASS_AVAILABLE(10_11, 9_0)
     32WK_CLASS_AVAILABLE(macosx(10.11), ios(9.0))
    3333@interface _WKUserContentExtensionStore : NSObject
    3434
    … …  
    4242@end
    4343
    44 WK_EXTERN NSString * const _WKUserContentExtensionsDomain WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     44WK_EXTERN NSString * const _WKUserContentExtensionsDomain WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4545
    4646typedef NS_ENUM(NSInteger, _WKUserContentExtensionStoreErrorCode) {
    … …  
    4949    _WKUserContentExtensionStoreErrorCompileFailed,
    5050    _WKUserContentExtensionStoreErrorRemoveFailed,
    51 } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     51} WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5252
    5353#endif // WK_API_ENABLED

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentFilter.h

    r189547 r202789  
    2828#if WK_API_ENABLED
    2929
    30 WK_CLASS_AVAILABLE(10_11, 9_0)
     30WK_CLASS_AVAILABLE(macosx(10.11), ios(9.0))
    3131@interface _WKUserContentFilter : NSObject
    3232

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentWorld.h

    r197172 r202789  
    3030NS_ASSUME_NONNULL_BEGIN
    3131
    32 WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     32WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
    3333@interface _WKUserContentWorld : NSObject
    3434

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h

    r202758 r202789  
    3434@class _WKUserContentWorld;
    3535
    36 WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     36WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
    3737@interface _WKUserStyleSheet : NSObject <NSCopying>
    3838

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h

    r188891 r202789  
    2828#if WK_API_ENABLED
    2929
    30 WK_CLASS_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use _WKVisitedLinkStore instead")
     30WK_CLASS_DEPRECATED_WITH_REPLACEMENT("_WKVisitedLinkStore", macosx(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA))
    3131@interface _WKVisitedLinkProvider : _WKVisitedLinkStore
    3232@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.h

    r188891 r202789  
    2929#if WK_API_ENABLED
    3030
    31 WK_CLASS_AVAILABLE(10_10, 8_0)
     31WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3232@interface _WKVisitedLinkStore : NSObject
    3333

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h

    r189547 r202789  
    3030#import <WebKit/WKWebsiteDataRecord.h>
    3131
    32 WK_CLASS_DEPRECATED(10_11, 10_11, 9_0, 9_0, "Please use WKWebsiteDataRecord instead")
     32WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebsiteDataRecord", macosx(10.11, 10.11), ios(9.0, 9.0))
    3333@interface _WKWebsiteDataRecord : WKWebsiteDataRecord
    3434@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h

    r202758 r202789  
    3232NS_ASSUME_NONNULL_BEGIN
    3333
    34 WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     34WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
    3535@interface _WKWebsiteDataSize : NSObject
    3636

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h

    r189547 r202789  
    3232typedef NS_OPTIONS(NSUInteger, WKWebsiteDataTypes) {
    3333    WKWebsiteDataTypeAll = NSUIntegerMax,
    34 } WK_ENUM_AVAILABLE(10_11, 9_0);
     34} WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    3535
    3636
    37 WK_CLASS_DEPRECATED(10_10, 10_11, 8_0, 9_0, "Please use WKWebsiteDataStore instead")
     37WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKWebsiteDataStore", macosx(10.10, 10.11), ios(8.0, 9.0))
    3838@interface _WKWebsiteDataStore : NSObject
    3939

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h

    r199040 r202789  
    4545// The return value is exposed in the UI process via the userObject property of the _WKFormInputSession object.
    4646- (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willBeginInputSessionForElement:(WKWebProcessPlugInNodeHandle *)node inFrame:(WKWebProcessPlugInFrame *)frame;
    47 - (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willBeginInputSessionForElement:(WKWebProcessPlugInNodeHandle *)node inFrame:(WKWebProcessPlugInFrame *)frame userIsInteracting:(BOOL)userIsInteracting WK_AVAILABLE(NA, WK_IOS_TBA);
     47- (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willBeginInputSessionForElement:(WKWebProcessPlugInNodeHandle *)node inFrame:(WKWebProcessPlugInFrame *)frame userIsInteracting:(BOOL)userIsInteracting WK_API_AVAILABLE(ios(WK_IOS_TBA));
    4848
    4949- (BOOL)_webProcessPlugInBrowserContextControllerShouldNotifyOnFormChanges:(WKWebProcessPlugInBrowserContextController *)controller;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h

    r202758 r202789  
    3737@class WKWebProcessPlugInScriptWorld;
    3838
    39 WK_CLASS_AVAILABLE(10_10, 8_0)
     39WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4040@interface WKWebProcessPlugInFrame : NSObject
    4141
    … …  
    4848// Returns URLs ordered by resolution in descending order.
    4949// FIXME: These should be tagged nonnull.
    50 @property (nonatomic, readonly) NSArray<NSURL *> *appleTouchIconURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    51 @property (nonatomic, readonly) NSArray<NSURL *> *faviconURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     50@property (nonatomic, readonly) NSArray<NSURL *> *appleTouchIconURLs WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     51@property (nonatomic, readonly) NSArray<NSURL *> *faviconURLs WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    5252
    5353- (JSContext *)jsContextForWorld:(WKWebProcessPlugInScriptWorld *)world;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h

    r168566 r202789  
    3232@class WKWebProcessPlugInNodeHandle;
    3333
    34 WK_CLASS_AVAILABLE(10_10, 8_0)
     34WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3535@interface WKWebProcessPlugInHitTestResult : NSObject
    3636

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h

    r189547 r202789  
    3838@class WKWebProcessPlugInFrame;
    3939
    40 WK_CLASS_AVAILABLE(10_10, 8_0)
     40WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4141@interface WKWebProcessPlugInNodeHandle : NSObject
    4242
    … …  
    4545
    4646#if TARGET_OS_IPHONE
    47 - (UIImage *)renderedImageWithOptions:(WKSnapshotOptions)options WK_AVAILABLE(10_11, 9_0);
     47- (UIImage *)renderedImageWithOptions:(WKSnapshotOptions)options WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    4848#else
    49 - (NSImage *)renderedImageWithOptions:(WKSnapshotOptions)options WK_AVAILABLE(10_11, 9_0);
     49- (NSImage *)renderedImageWithOptions:(WKSnapshotOptions)options WK_API_AVAILABLE(macosx(10.11), ios(9.0));
    5050#endif
    5151

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h

    r168566 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface WKWebProcessPlugInPageGroup : NSObject
    3434

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h

    r198881 r202789  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface WKWebProcessPlugInScriptWorld : NSObject
    3434
    … …  
    3939
    4040- (void)clearWrappers;
    41 - (void)makeAllShadowRootsOpen WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     41- (void)makeAllShadowRootsOpen WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    4242
    4343@end

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMDocument.h

    r168566 r202789  
    3333@class WKDOMText;
    3434
    35 WK_CLASS_AVAILABLE(10_10, 8_0)
     35WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3636@interface WKDOMDocument : WKDOMNode
    3737

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMElement.h

    r168566 r202789  
    3030#import <WebKit/WKDOMNode.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface WKDOMElement : WKDOMNode
    3434

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h

    r168566 r202789  
    3232@class WKDOMDocument;
    3333
    34 WK_CLASS_AVAILABLE(10_10, 8_0)
     34WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3535@interface WKDOMNode : NSObject
    3636

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h

    r200662 r202789  
    3838
    3939
    40 WK_CLASS_AVAILABLE(10_10, 8_0)
     40WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4141@interface WKDOMRange : NSObject
    4242

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h

    r168566 r202789  
    3030#import <WebKit/WKDOMNode.h>
    3131
    32 WK_CLASS_AVAILABLE(10_10, 8_0)
     32WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3333@interface WKDOMText : WKDOMNode
    3434

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h

    r168566 r202789  
    3232@class WKDOMRange;
    3333
    34 WK_CLASS_AVAILABLE(10_10, 8_0)
     34WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3535@interface WKDOMTextIterator : NSObject
    3636

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h

    r168566 r202789  
    4242@end
    4343
    44 WK_CLASS_AVAILABLE(10_10, 8_0)
     44WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    4545@interface WKWebProcessPlugInController : NSObject
    4646

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h

    r168566 r202789  
    3636@protocol WKWebProcessPlugInLoadDelegate;
    3737
    38 WK_CLASS_AVAILABLE(10_10, 8_0)
     38WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
    3939@interface WKWebProcessPlugInBrowserContextController : NSObject
    4040

  • trunk/Source/WebKit2/mac/postprocess-framework-headers.sh

    r202758 r202789  
    5151function rewrite_headers () {
    5252    if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
    53         [[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET/\./_}
     53        [[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
    5454        [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
    5555    elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
    56         [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET/\./_}
     56        [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}
    5757        [[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
    5858    fi
    … …  
    6565            -e s/WK_MAC_TBA/${OSX_VERSION}/g
    6666            -e s/WK_IOS_TBA/${IOS_VERSION}/g
    67             -e s/WK_AVAILABLE/NS_AVAILABLE/
    68             -e s/WK_DEPRECATED/NS_DEPRECATED/
    69             -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/
    70             -e s/WK_ENUM_DEPRECATED/NS_ENUM_DEPRECATED/
    71             -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/
    72             -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/
     67            -e s/WK_API_AVAILABLE/API_AVAILABLE/
     68            -e s/WK_API_DEPRECATED/API_DEPRECATED/
     69            -e "s/^WK_CLASS_AVAILABLE/WK_EXTERN API_AVAILABLE/"
     70            -e "s/^WK_CLASS_DEPRECATED/WK_EXTERN API_DEPRECATED/"
    7371        )
    7472    else
    75         SED_OPTIONS+=(-e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\([^\)]+\)//g' -e 's/WK_(CLASS_|ENUM_)?DEPRECATED\([^\)]+\)//g')
     73        SED_OPTIONS+=(-e 's/WK_(API_|CLASS_)AVAILABLE\(.*\)\s*\)//g' -e 's/WK_(API_|CLASS_)DEPRECATED(_WITH_REPLACEMENT)?\(.*\)\s*\)//g')
    7674    fi
    7775
    … …  
    8179        if [[ "$HEADER_PATH" -nt $TIMESTAMP_PATH ]]; then
    8280            ditto "${HEADER_PATH}" "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}"
    83             sed -i .tmp -E ${SED_OPTIONS[*]} "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}" || exit $?
     81            sed -i .tmp -E "${SED_OPTIONS[@]}" "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}" || exit $?
    8482            mv "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}" "$HEADER_PATH"
    8583        fi
Note: See TracChangeset for help on using the changeset viewer.