Title: [186953] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 186953
- Author
- matthew_han...@apple.com
- Date
- 2015-07-16 23:24:47 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186808. rdar://problem/21801544
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186952 => 186953)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 06:15:44 UTC (rev 186952)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 06:24:47 UTC (rev 186953)
@@ -1,5 +1,24 @@
2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186808. rdar://problem/21801544
+
+ 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-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186924. rdar://problem/21669802
2015-07-16 Matt Baker <mattba...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (186952 => 186953)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-17 06:15:44 UTC (rev 186952)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-17 06:24:47 UTC (rev 186953)
@@ -152,6 +152,9 @@
CGPoint _lastInteractionLocation;
WebKit::WKSelectionDrawingInfo _lastSelectionDrawingInfo;
+#if HAVE(LINK_PREVIEW)
+ id <UIViewControllerPreviewing> _previewing;
+#endif
BOOL _isEditable;
BOOL _showingTextStyleOptions;
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186952 => 186953)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-17 06:15:44 UTC (rev 186952)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-17 06:24:47 UTC (rev 186953)
@@ -3182,16 +3182,20 @@
- (void)_registerPreviewInWindow:(UIWindow *)window
{
- [window.rootViewController registerPreviewSourceView:self previewingDelegate:self];
- _previewGestureRecognizer = self.gestureRecognizers.lastObject;
+ _previewing = [[window.rootViewController registerForPreviewingWithSourceView:self] retain];
+ _previewing.delegate = self;
+ _previewGestureRecognizer = _previewing.presentationGestureRecognizer;
[_previewGestureRecognizer setDelegate:self];
}
- (void)_unregisterPreviewInWindow:(UIWindow *)window
{
- [window.rootViewController unregisterPreviewSourceView:self];
+ [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
