Diff
Modified: trunk/Source/WebKit2/ChangeLog (202792 => 202793)
--- trunk/Source/WebKit2/ChangeLog 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-03 19:44:26 UTC (rev 202793)
@@ -1,5 +1,24 @@
2016-07-03 Dan Bernstein <m...@apple.com>
+ Follow-up to r202789.
+
+ Reviewed by Sam Weinig.
+
+ Ensure that API that isn’t available at all on a platform is declared under an appropriate
+ TARGET_OS_* conditional.
+
+ * Shared/API/Cocoa/_WKHitTestResult.h:
+ * Shared/API/Cocoa/_WKHitTestResult.mm:
+ * Shared/API/Cocoa/_WKHitTestResultInternal.h:
+ * UIProcess/API/Cocoa/WKOpenPanelParameters.h:
+ * UIProcess/API/Cocoa/WKOpenPanelParameters.mm:
+ * UIProcess/API/Cocoa/WKOpenPanelParametersInternal.h:
+ * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h:
+ * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm:
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
+2016-07-03 Dan Bernstein <m...@apple.com>
+
[Cocoa] Adopt modern API availability macros
https://bugs.webkit.org/show_bug.cgi?id=159378
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.h (202792 => 202793)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.h 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.h 2016-07-03 19:44:26 UTC (rev 202793)
@@ -25,7 +25,7 @@
#import <WebKit/WKFoundation.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
#import <Foundation/Foundation.h>
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.mm (202792 => 202793)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.mm 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.mm 2016-07-03 19:44:26 UTC (rev 202793)
@@ -26,7 +26,7 @@
#import "config.h"
#import "_WKHitTestResultInternal.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
@implementation _WKHitTestResult
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResultInternal.h (202792 => 202793)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResultInternal.h 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResultInternal.h 2016-07-03 19:44:26 UTC (rev 202793)
@@ -25,7 +25,7 @@
#import "_WKHitTestResult.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
#import "APIHitTestResult.h"
#import "WKObject.h"
Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (202792 => 202793)
--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2016-07-03 19:44:26 UTC (rev 202793)
@@ -167,9 +167,11 @@
wrapper = [WKFrameInfo alloc];
break;
+#if PLATFORM(MAC)
case Type::HitTestResult:
wrapper = [_WKHitTestResult alloc];
break;
+#endif
case Type::Navigation:
wrapper = [WKNavigation alloc];
@@ -187,9 +189,11 @@
wrapper = [WKNavigationResponse alloc];
break;
+#if PLATFORM(MAC)
case Type::OpenPanelParameters:
wrapper = [WKOpenPanelParameters alloc];
break;
+#endif
case Type::PageGroup:
wrapper = [WKBrowsingContextGroup alloc];
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.h (202792 => 202793)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.h 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.h 2016-07-03 19:44:26 UTC (rev 202793)
@@ -25,7 +25,7 @@
#import <WebKit/WKFoundation.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
#import <Foundation/Foundation.h>
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.mm (202792 => 202793)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.mm 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.mm 2016-07-03 19:44:26 UTC (rev 202793)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKOpenPanelParametersInternal.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
@implementation WKOpenPanelParameters
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParametersInternal.h (202792 => 202793)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParametersInternal.h 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParametersInternal.h 2016-07-03 19:44:26 UTC (rev 202793)
@@ -25,7 +25,7 @@
#import "WKOpenPanelParameters.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
#import "APIOpenPanelParameters.h"
#import "WKObject.h"
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h (202792 => 202793)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h 2016-07-03 19:44:26 UTC (rev 202793)
@@ -26,7 +26,7 @@
#import <WebKit/WKFoundation.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && TARGET_OS_IPHONE
#import <Foundation/Foundation.h>
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm (202792 => 202793)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm 2016-07-03 19:44:26 UTC (rev 202793)
@@ -26,7 +26,7 @@
#include "config.h"
#include "WKPreviewActionItemIdentifiers.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(IOS)
NSString * const WKPreviewActionItemIdentifierOpen = @"WKPreviewActionItemIdentifierOpen";
NSString * const WKPreviewActionItemIdentifierAddToReadingList = @"WKPreviewActionItemIdentifierAddToReadingList";
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (202792 => 202793)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-07-03 19:34:55 UTC (rev 202792)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-07-03 19:44:26 UTC (rev 202793)
@@ -39,6 +39,8 @@
_WKPaginationModeBottomToTop,
} WK_API_AVAILABLE(macosx(10.10), ios(8.0));
+#if !TARGET_OS_IPHONE
+
typedef NS_ENUM(NSInteger, _WKImmediateActionType) {
_WKImmediateActionNone,
_WKImmediateActionLinkPreview,
@@ -48,6 +50,8 @@
_WKImmediateActionTelLink
} WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+#endif
+
@class WKBrowsingContextHandle;
@class _WKFrameHandle;
@class _WKHitTestResult;
