Title: [187333] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187333
- Author
- [email protected]
- Date
- 2015-07-24 01:18:59 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187268. rdar://problem/21664211
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187332 => 187333)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 08:03:51 UTC (rev 187332)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 08:18:59 UTC (rev 187333)
@@ -1,5 +1,17 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187268. rdar://problem/21664211
+
+ 2015-07-23 Enrica Casucci <[email protected]>
+
+ Removing one incorrect annotation from the previous change.
+
+ Unreviewed.
+
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+2015-07-24 Matthew Hanson <[email protected]>
+
Merge r187288. rdar://problem/21929532
2015-07-23 Dan Bernstein <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (187332 => 187333)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-07-24 08:03:51 UTC (rev 187332)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-07-24 08:18:59 UTC (rev 187333)
@@ -57,7 +57,7 @@
#if TARGET_OS_IPHONE
- (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
-- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(WK_ARRAY(_WKElementAction *) *)defaultActions WK_AVAILABLE(NA, WK_IOS_TBA);
+- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(WK_ARRAY(_WKElementAction *) *)defaultActions;
- (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
- (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_AVAILABLE(NA, WK_IOS_TBA);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
