Diff
Modified: trunk/Source/WebKit2/ChangeLog (177746 => 177747)
--- trunk/Source/WebKit2/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-26 19:18:49 UTC (rev 177747)
@@ -1,5 +1,64 @@
2014-12-26 Dan Bernstein <[email protected]>
+ [Cocoa] Some modern SPI changes have missing or incorrect availability annotations
+ https://bugs.webkit.org/show_bug.cgi?id=139940
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/c/WKDeclarationSpecifiers.h: Renamed WK_DEPRECATED to WK_C_DEPRECATED.
+
+ * Shared/API/Cocoa/WKFoundation.h: Define WK_DEPRECATED when API availability is not enabled
+ to mean that the declaration is currently deprecated.
+
+ * Shared/API/c/WKConnectionRef.h: Updated for the renaming of the existing WK_DEPRECATED to
+ WK_C_DEPRECATED.
+ * UIProcess/API/C/WKContext.h: Ditto.
+ * UIProcess/API/C/WKContextConnectionClient.h: Ditto.
+ * UIProcess/API/C/WKContextDownloadClient.h: Ditto.
+ * UIProcess/API/C/WKContextHistoryClient.h: Ditto.
+ * UIProcess/API/C/WKContextInjectedBundleClient.h: Ditto.
+ * UIProcess/API/C/WKCookieManager.h: Ditto.
+ * UIProcess/API/C/WKDatabaseManager.h: Ditto.
+ * UIProcess/API/C/WKGeolocationManager.h: Ditto.
+ * UIProcess/API/C/WKIconDatabase.h: Ditto.
+ * UIProcess/API/C/WKNotificationProvider.h: Ditto.
+ * UIProcess/API/C/WKPageContextMenuClient.h: Ditto.
+ * UIProcess/API/C/WKPageFindClient.h: Ditto.
+ * UIProcess/API/C/WKPageFindMatchesClient.h: Ditto.
+ * UIProcess/API/C/WKPageFormClient.h: Ditto.
+ * UIProcess/API/C/WKPageUIClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundle.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h: Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h: Ditto.
+
+ * Shared/API/Cocoa/WKRenderingProgressEvents.h: Added missing availability annotation.
+
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Changed to use WK_MAC_TBA and WK_IOS_TBA for
+ _WKDebugOverlayRegions enum. Added availability annotations to new properties.
+
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Added availability annotation to new method.
+
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Annotated new method, changed Mac
+ availability of iOS-only method to NA.
+
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h: Added availability annotation to new enum value,
+ new property, and new method. Added deprecation annotation to one method.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h: Annotated new method.
+
+ * mac/rewrite-availability-macros.sh: Rewrite WK_DEPRECATED to NS_DEPRECATED.
+
+2014-12-26 Dan Bernstein <[email protected]>
+
<rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
https://bugs.webkit.org/show_bug.cgi?id=139950
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (177746 => 177747)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -47,6 +47,7 @@
#ifndef WK_API_AVAILABILITY_ENABLED
#define WK_AVAILABLE(_mac, _ios)
#define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility ("default")))
+#define WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
#define WK_ENUM_AVAILABLE(_mac, _ios)
#define WK_ENUM_AVAILABLE_IOS(_ios)
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h (177746 => 177747)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -30,7 +30,7 @@
typedef NS_OPTIONS(NSUInteger, WKRenderingProgressEvents)
{
WKRenderingProgressEventFirstLayout = 1 << 0,
- WKRenderingProgressEventFirstVisuallyNonEmptyLayout = 1 << 1,
+ WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 1,
WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
};
Modified: trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h (177746 => 177747)
--- trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -56,7 +56,7 @@
// Version 0.
WKConnectionDidReceiveMessageCallback didReceiveMessage;
WKConnectionDidCloseCallback didClose;
-} WKConnectionClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKConnectionClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKConnectionGetTypeID();
Modified: trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (177746 => 177747)
--- trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -51,9 +51,9 @@
#endif
#if defined(__has_extension) && __has_extension(enumerator_attributes) && __has_extension(attribute_unavailable_with_message)
-#define WK_DEPRECATED(message) __attribute__((deprecated(message)))
+#define WK_C_DEPRECATED(message) __attribute__((deprecated(message)))
#else
-#define WK_DEPRECATED(message)
+#define WK_C_DEPRECATED(message)
#endif
#if defined(__has_extension) && __has_extension(enumerator_attributes) && __has_extension(attribute_unavailable_with_message)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -84,7 +84,7 @@
WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged;
WKContextNetworkProcessDidCrashCallback networkProcessDidCrash;
WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
-} WKContextClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKContextClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
enum {
kWKProcessModelSharedSecondaryProcess = 0,
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -49,6 +49,6 @@
// Version 0.
WKContextDidCreateConnection didCreateConnection;
-} WKContextConnectionClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKContextConnectionClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKContextConnectionClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -79,6 +79,6 @@
WKContextDownloadDidFailCallback didFail;
WKContextDownloadDidCancel didCancel;
WKContextDownloadProcessDidCrashCallback processDidCrash;
-} WKContextDownloadClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKContextDownloadClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKContextDownloadClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -61,6 +61,6 @@
WKContextDidPerformServerRedirectCallback didPerformServerRedirect;
WKContextDidUpdateHistoryTitleCallback didUpdateHistoryTitle;
WKContextPopulateVisitedLinksCallback populateVisitedLinks;
-} WKContextHistoryClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKContextHistoryClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKContextHistoryClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -68,6 +68,6 @@
// Version 1.
WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData;
-} WKContextInjectedBundleClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKContextInjectedBundleClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKContextInjectedBundleClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -62,7 +62,7 @@
// Version 0.
WKCookieManagerCookiesDidChangeCallback cookiesDidChange;
-} WKCookieManagerClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKCookieManagerClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKCookieManagerGetTypeID();
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -93,7 +93,7 @@
// Version 0.
WKDatabaseManagerDidModifyOriginCallback didModifyOrigin;
WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase;
-} WKDatabaseManagerClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKDatabaseManagerClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID();
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -70,7 +70,7 @@
// Version 1.
WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy;
-} WKGeolocationProvider WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKGeolocationProvider WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKGeolocationManagerGetTypeID();
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -72,7 +72,7 @@
// Version 1.
WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL;
-} WKIconDatabaseClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKIconDatabaseClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -71,7 +71,7 @@
WKNotificationProviderRemoveNotificationManagerCallback removeNotificationManager;
WKNotificationProviderNotificationPermissionsCallback notificationPermissions;
WKNotificationProviderClearNotificationsCallback clearNotifications;
-} WKNotificationProvider WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKNotificationProvider WK_C_DEPRECATED("Use an explicit versioned struct instead");
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -116,7 +116,7 @@
// Version 3.
WKPageShowContextMenuCallback showContextMenu;
WKPageHideContextMenuCallback hideContextMenu;
-} WKPageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKPageContextMenuClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -59,7 +59,7 @@
WKPageDidFindStringCallback didFindString;
WKPageDidFailToFindStringCallback didFailToFindString;
WKPageDidCountStringMatchesCallback didCountStringMatches;
-} WKPageFindClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKPageFindClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -59,7 +59,7 @@
const void * clientInfo;
WKPageDidFindStringMatchesCallback didFindStringMatches;
WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult;
-} WKPageFindMatchesClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKPageFindMatchesClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -54,7 +54,7 @@
// Version 0.
WKPageWillSubmitFormCallback willSubmitForm;
-} WKPageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKPageFormClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -503,7 +503,7 @@
WKPageShowColorPickerCallback showColorPicker;
WKPageHideColorPickerCallback hideColorPicker;
WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
-} WKPageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKPageUIClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -40,7 +40,7 @@
typedef NS_OPTIONS(NSUInteger, _WKDebugOverlayRegions) {
_WKNonFastScrollableRegion = 1 << 0,
_WKWheelEventHandlerRegion = 1 << 1
-} WK_ENUM_AVAILABLE(10_11, 9_0);
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@interface WKPreferences (WKPrivate)
@@ -51,17 +51,17 @@
@property (nonatomic, setter=_setCompositingBordersVisible:) BOOL _compositingBordersVisible;
@property (nonatomic, setter=_setCompositingRepaintCountersVisible:) BOOL _compositingRepaintCountersVisible;
@property (nonatomic, setter=_setTiledScrollingIndicatorVisible:) BOOL _tiledScrollingIndicatorVisible;
-@property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions;
-@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled;
+@property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled;
-@property (nonatomic, setter=_setStandalone:, getter=_isStandalone) BOOL _standalone;
+@property (nonatomic, setter=_setStandalone:, getter=_isStandalone) BOOL _standalone WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
// FIXME: This should be configured on the WKWebsiteDataStore.
// FIXME: This property should not have the verb "is" in it.
@property (nonatomic, setter=_setOfflineApplicationCacheIsEnabled:) BOOL _offlineApplicationCacheIsEnabled;
-@property (nonatomic, setter=_setFullScreenEnabled:) BOOL _fullScreenEnabled;
+@property (nonatomic, setter=_setFullScreenEnabled:) BOOL _fullScreenEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -37,7 +37,7 @@
@property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
-- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value;
+- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy;
- (id)_objectForBundleParameter:(NSString *)parameter;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -43,8 +43,8 @@
@property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
#if TARGET_OS_IPHONE
-@property (nonatomic, setter=_setAllowsAlternateFullscreen:) BOOL _allowsAlternateFullscreen;
-@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, setter=_setAllowsAlternateFullscreen:) BOOL _allowsAlternateFullscreen WK_AVAILABLE(NA, WK_IOS_TBA);
+@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled WK_AVAILABLE(NA, WK_IOS_TBA);
#endif
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -29,7 +29,7 @@
typedef NS_OPTIONS(NSUInteger, _WKRenderingProgressEvents) {
_WKRenderingProgressEventFirstLayout = 1 << 0,
- _WKRenderingProgressEventFirstVisuallyNonEmptyLayout = 1 << 1,
+ _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 1,
_WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
_WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 3
} WK_ENUM_AVAILABLE(10_10, 8_0);
@@ -80,7 +80,7 @@
@property (nonatomic, readonly) NSArray *_certificateChain;
@property (nonatomic, readonly) NSURL *_committedURL;
@property (nonatomic, readonly) NSString *_MIMEType;
-@property (nonatomic, readonly) NSString *_userAgent;
+@property (nonatomic, readonly) NSString *_userAgent WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (copy, setter=_setApplicationNameForUserAgent:) NSString *_applicationNameForUserAgent;
@property (copy, setter=_setCustomUserAgent:) NSString *_customUserAgent;
@@ -142,9 +142,9 @@
// Deprecated: Use [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:] instead.
// This function is kept for binary compatibility with iOS 8.0, it can be removed after the bincompat window.
-- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
+- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_DEPRECATED(NA, NA, 8_0, WK_IOS_TBA, "use -_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:");
-- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
+- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride WK_AVAILABLE(NA, WK_IOS_TBA);
- (UIView *)_viewForFindUI;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (177746 => 177747)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -47,7 +47,7 @@
@property (readonly, getter=isNonPersistent) BOOL nonPersistent;
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@end
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -81,7 +81,7 @@
// Version 1.
WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage;
-} WKBundleClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundleClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKBundleGetTypeID();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -69,7 +69,7 @@
WKBundlePageBannerMouseUpCallback mouseUp;
WKBundlePageBannerMouseMovedCallback mouseMoved;
WKBundlePageBannerMouseDraggedCallback mouseDragged;
-} WKBundlePageBannerClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageBannerClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKBundlePageBannerGetTypeID();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -56,6 +56,6 @@
// Version 0.
WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu;
-} WKBundlePageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageContextMenuClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageContextMenuClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -76,6 +76,6 @@
WKBundlePageLogDiagnosticMessageCallback logDiagnosticMessage;
WKBundlePageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
WKBundlePageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
-} WKBundlePageDiagnosticLoggingClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageDiagnosticLoggingClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageDiagnosticLoggingClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -136,6 +136,6 @@
WKBundlePageWillWriteToPasteboard willWriteToPasteboard;
WKBundlePageGetPasteboardDataForRange getPasteboardDataForRange;
WKBundlePageDidWriteToPasteboard didWriteToPasteboard;
-} WKBundlePageEditorClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageEditorClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageEditorClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -112,6 +112,6 @@
WKBundlePageDidFocusTextFieldCallback didFocusTextField;
WKBundlePageShouldNotifyOnFormChangesCallback shouldNotifyOnFormChanges;
WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls;
-} WKBundlePageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageFormClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageFormClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -78,6 +78,6 @@
WKBundlePageBeganEnterFullScreen beganEnterFullScreen;
WKBundlePageBeganExitFullScreen beganExitFullScreen;
WKBundlePageCloseFullScreen closeFullScreen;
-} WKBundlePageFullScreenClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageFullScreenClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageFullScreenClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -520,6 +520,6 @@
// Version 7
WKBundlePageWillDestroyFrame willDestroyFrame;
-} WKBundlePageLoaderClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageLoaderClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageLoaderClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -100,7 +100,7 @@
WKBundlePageOverlayMouseUpCallback mouseUp;
WKBundlePageOverlayMouseMovedCallback mouseMoved;
WKBundlePageOverlayMouseDraggedCallback mouseDragged;
-} WKBundlePageOverlayClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageOverlayClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
typedef WKTypeRef (*WKAccessibilityAttributeValueCallback)(WKBundlePageOverlayRef pageOverlay, WKStringRef attribute, WKTypeRef parameter, const void* clientInfo);
typedef WKArrayRef (*WKAccessibilityAttributeNamesCallback)(WKBundlePageOverlayRef pageOverlay, bool parameterizedNames, const void* clientInfo);
@@ -126,7 +126,7 @@
// Version 0.
WKAccessibilityAttributeValueCallback copyAccessibilityAttributeValue;
WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames;
-} WKBundlePageOverlayAccessibilityClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageOverlayAccessibilityClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
WK_EXPORT WKTypeID WKBundlePageOverlayGetTypeID();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -64,6 +64,6 @@
WKBundlePageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction;
WKBundlePageDecidePolicyForResponseCallback decidePolicyForResponse;
WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy;
-} WKBundlePagePolicyClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePagePolicyClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePagePolicyClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -95,6 +95,6 @@
// Version 1.
WKBundlePageShouldCacheResponseCallback shouldCacheResponse;
WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage;
-} WKBundlePageResourceLoadClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageResourceLoadClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageResourceLoadClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h (177746 => 177747)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2014-12-26 19:18:49 UTC (rev 177747)
@@ -201,6 +201,6 @@
WKBundlePagePlugInCreateStartLabelSubtitleCallback createPlugInStartLabelSubtitle;
WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet;
WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript;
-} WKBundlePageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
+} WKBundlePageUIClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
#endif // WKBundlePageUIClient_h
Modified: trunk/Source/WebKit2/mac/rewrite-availability-macros.sh (177746 => 177747)
--- trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2014-12-26 15:45:44 UTC (rev 177746)
+++ trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2014-12-26 19:18:49 UTC (rev 177747)
@@ -47,7 +47,7 @@
for HEADER_PATH in $1/*.h; do
if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
- sed -e s/WK_MAC_TBA/${OSX_VERSION}/ -e s/WK_IOS_TBA/${IOS_VERSION}/ -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
+ sed -e s/WK_MAC_TBA/${OSX_VERSION}/ -e s/WK_IOS_TBA/${IOS_VERSION}/ -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH;
fi
done
