Title: [186808] trunk/Source/WebKit2
- Revision
- 186808
- Author
- commit-qu...@webkit.org
- Date
- 2015-07-14 10:37:55 -0700 (Tue, 14 Jul 2015)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=146917
iOS WebKit doesn't build.
rdar://problem/21801544
Fix the build - don't use deprecated methods.
Patch by Yongjun Zhang <yongjun_zh...@apple.com> on 2015-07-14
Reviewed by Dan Bernstein.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _registerPreviewInWindow:]):
(-[WKContentView _unregisterPreviewInWindow:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186807 => 186808)
--- trunk/Source/WebKit2/ChangeLog 2015-07-14 17:36:54 UTC (rev 186807)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-14 17:37:55 UTC (rev 186808)
@@ -1,5 +1,20 @@
2015-07-14 Yongjun Zhang <yongjun_zh...@apple.com>
+ https://bugs.webkit.org/show_bug.cgi?id=146917
+ iOS WebKit doesn't build.
+ rdar://problem/21801544
+
+ Fix the build - don't use deprecated methods.
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _registerPreviewInWindow:]):
+ (-[WKContentView _unregisterPreviewInWindow:]):
+
+2015-07-14 Yongjun Zhang <yongjun_zh...@apple.com>
+
https://bugs.webkit.org/show_bug.cgi?id=146909
Add actions for default link preview that uses SFSafariViewController.
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (186807 => 186808)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-14 17:36:54 UTC (rev 186807)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-14 17:37:55 UTC (rev 186808)
@@ -152,6 +152,9 @@
CGPoint _lastInteractionLocation;
WebKit::WKSelectionDrawingInfo _lastSelectionDrawingInfo;
+#if HAVE(LINK_PREVIEW)
+ id <UIViewControllerPreviewing> _previewing;
+#endif
BOOL _isEditable;
BOOL _showingTextStyleOptions;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186807 => 186808)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-14 17:36:54 UTC (rev 186807)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-14 17:37:55 UTC (rev 186808)
@@ -3182,22 +3182,20 @@
- (void)_registerPreviewInWindow:(UIWindow *)window
{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [window.rootViewController registerPreviewSourceView:self previewingDelegate:self];
-#pragma clang diagnostic pop
- _previewGestureRecognizer = self.gestureRecognizers.lastObject;
+ _previewing = [[window.rootViewController registerForPreviewingWithSourceView:self] retain];
+ _previewing.delegate = self;
+ _previewGestureRecognizer = _previewing.presentationGestureRecognizer;
[_previewGestureRecognizer setDelegate:self];
}
- (void)_unregisterPreviewInWindow:(UIWindow *)window
{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [window.rootViewController unregisterPreviewSourceView:self];
-#pragma clang diagnostic pop
+ [window.rootViewController unregisterPreviewing:_previewing];
+ _previewing.delegate = nil;
[_previewGestureRecognizer setDelegate:nil];
_previewGestureRecognizer = nil;
+ [_previewing release];
+ _previewing = nil;
}
- (UIViewController *)previewViewControllerForPosition:(CGPoint)position inSourceView:(UIView *)sourceView
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
