Title: [203086] trunk/Source/WebKit2
- Revision
- 203086
- Author
- m...@apple.com
- Date
- 2016-07-11 15:02:38 -0700 (Mon, 11 Jul 2016)
Log Message
Cleaned up API availability.
Requested by Tim Horton.
* UIProcess/API/Cocoa/WKNavigationAction.mm:
* UIProcess/API/Cocoa/WKNavigationActionPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (203085 => 203086)
--- trunk/Source/WebKit2/ChangeLog 2016-07-11 21:34:36 UTC (rev 203085)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-11 22:02:38 UTC (rev 203086)
@@ -1,3 +1,12 @@
+2016-07-11 Dan Bernstein <m...@apple.com>
+
+ Cleaned up API availability.
+
+ Requested by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ * UIProcess/API/Cocoa/WKNavigationActionPrivate.h:
+
2016-07-11 Enrica Casucci <enr...@apple.com>
Add synthetic click origin to WKNavigationAction.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (203085 => 203086)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2016-07-11 21:34:36 UTC (rev 203085)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2016-07-11 22:02:38 UTC (rev 203086)
@@ -55,6 +55,7 @@
return WKNavigationTypeOther;
}
+#if PLATFORM(IOS)
static WKSyntheticClickType toWKSyntheticClickType(WebKit::WebMouseEvent::SyntheticClickType syntheticClickType)
{
switch (syntheticClickType) {
@@ -68,6 +69,7 @@
ASSERT_NOT_REACHED();
return WKSyntheticClickTypeNoTap;
}
+#endif
#if PLATFORM(MAC)
@@ -150,10 +152,12 @@
return _navigationAction->request().nsURLRequest(WebCore::DoNotUpdateHTTPBody);
}
+#if PLATFORM(IOS)
- (WKSyntheticClickType)_syntheticClickType
{
return toWKSyntheticClickType(_navigationAction->syntheticClickType());
}
+#endif
#if PLATFORM(MAC)
- (NSEventModifierFlags)modifierFlags
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h (203085 => 203086)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h 2016-07-11 21:34:36 UTC (rev 203085)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h 2016-07-11 22:02:38 UTC (rev 203086)
@@ -27,11 +27,13 @@
#if WK_API_ENABLED
+#if TARGET_OS_IPHONE
typedef NS_ENUM(NSInteger, WKSyntheticClickType) {
WKSyntheticClickTypeNoTap,
WKSyntheticClickTypeOneFingerTap,
WKSyntheticClickTypeTwoFingerTap
-} WK_API_AVAILABLE(macosx(NA), ios(10.0));
+} WK_API_AVAILABLE(ios(10.0));
+#endif
@interface WKNavigationAction (WKPrivate)
@@ -43,7 +45,9 @@
@property (nonatomic, readonly) BOOL _shouldOpenExternalURLs WK_API_DEPRECATED("use _shouldOpenExternalSchemes and _shouldOpenAppLinks", macosx(10.11, 10.11), ios(9.0, 9.0));
-@property (nonatomic, readonly) WKSyntheticClickType _syntheticClickType WK_API_AVAILABLE(macosx(NA), ios(10.0));
+#if TARGET_OS_IPHONE
+@property (nonatomic, readonly) WKSyntheticClickType _syntheticClickType WK_API_AVAILABLE(ios(10.0));
+#endif
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
