Changeset 202793 in webkit

Timestamp:

Jul 3, 2016, 12:44:26 PM (9 years ago)

Author:

mitz@apple.com

Message:

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/_WKHitTestResult.h (modified) (1 diff)
• Shared/API/Cocoa/_WKHitTestResult.mm (modified) (1 diff)
• Shared/API/Cocoa/_WKHitTestResultInternal.h (modified) (1 diff)
• Shared/Cocoa/APIObject.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKOpenPanelParameters.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKOpenPanelParameters.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKOpenPanelParametersInternal.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-07-03  Dan Bernstein  <mitz@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  <mitz@apple.com>
 

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

@@ -26 +26 @@
 #import <WebKit/WKFoundation.h>
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
 
 #import <Foundation/Foundation.h>

trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResult.mm

@@ -27 +27 @@
 #import "_WKHitTestResultInternal.h"
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
 
 @implementation _WKHitTestResult

trunk/Source/WebKit2/Shared/API/Cocoa/_WKHitTestResultInternal.h

@@ -26 +26 @@
 #import "_WKHitTestResult.h"
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
 
 #import "APIHitTestResult.h"

trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm

@@ -168 +168 @@
         break;
 
+#if PLATFORM(MAC)
     case Type::HitTestResult:
         wrapper = [_WKHitTestResult alloc];
         break;
+#endif
 
     case Type::Navigation:
@@ -188 +190 @@
         break;
 
+#if PLATFORM(MAC)
     case Type::OpenPanelParameters:
         wrapper = [WKOpenPanelParameters alloc];
         break;
+#endif
 
     case Type::PageGroup:

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

@@ -26 +26 @@
 #import <WebKit/WKFoundation.h>
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
 
 #import <Foundation/Foundation.h>

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParameters.mm

@@ -27 +27 @@
 #import "WKOpenPanelParametersInternal.h"
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
 
 @implementation WKOpenPanelParameters

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKOpenPanelParametersInternal.h

@@ -26 +26 @@
 #import "WKOpenPanelParameters.h"
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
 
 #import "APIOpenPanelParameters.h"

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

@@ -27 +27 @@
 #import <WebKit/WKFoundation.h>
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && TARGET_OS_IPHONE
 
 #import <Foundation/Foundation.h>

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm

@@ -27 +27 @@
 #include "WKPreviewActionItemIdentifiers.h"
 
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(IOS)
 
 NSString * const WKPreviewActionItemIdentifierOpen = @"WKPreviewActionItemIdentifierOpen";

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

@@ -40 +40 @@
 } WK_API_AVAILABLE(macosx(10.10), ios(8.0));
 
+#if !TARGET_OS_IPHONE
+
 typedef NS_ENUM(NSInteger, _WKImmediateActionType) {
     _WKImmediateActionNone,
@@ -48 +50 @@
     _WKImmediateActionTelLink
 } WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+
+#endif
 
 @class WKBrowsingContextHandle;