- Revision
- 187193
- Author
- timothy_hor...@apple.com
- Date
- 2015-07-22 16:23:02 -0700 (Wed, 22 Jul 2015)
Log Message
[iOS] Adjust the preview architecture
https://bugs.webkit.org/show_bug.cgi?id=147203
<rdar://problem/21945775>
Reviewed by Beth Dakin.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setAllowsLinkPreview:]): Deleted.
* UIProcess/ios/WKContentView.mm:
(-[WKContentView willMoveToWindow:]): Deleted.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView _registerPreview]):
(-[WKContentView _unregisterPreview]):
(-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
(-[WKContentView _presentationRectForPreviewItemController:]):
(-[WKContentView _presentedViewControllerForPreviewItemController:]):
(-[WKContentView _previewItemController:commitPreview:]):
(-[WKContentView _previewItemController:willPresentPreview:forPosition:inSourceView:]):
(-[WKContentView _previewItemController:didDismissPreview:committing:]):
(-[WKContentView _presentationSnapshotForPreviewItemController:]):
(-[WKContentView _presentationRectsForPreviewItemController:]):
(-[WKContentView gestureRecognizerShouldBegin:]): Deleted.
(-[WKContentView _registerPreviewInWindow:]): Deleted.
(-[WKContentView _unregisterPreviewInWindow:]): Deleted.
(-[WKContentView previewViewControllerForPosition:inSourceView:]): Deleted.
(-[WKContentView commitPreviewViewController:]): Deleted.
(-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]): Deleted.
(-[WKContentView didDismissPreviewViewController:committing:]): Deleted.
Register and unregister in setup/cleanupInteraction instead of when moving between windows.
Implement 'shouldBegin' instead of interacting directly with the recognizer.
Make use of system enums instead of our own.
Let UIPreviewItemController handle shrink-wrapping and the indicator view.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187192 => 187193)
--- trunk/Source/WebKit2/ChangeLog 2015-07-22 22:51:53 UTC (rev 187192)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-22 23:23:02 UTC (rev 187193)
@@ -1,3 +1,43 @@
+2015-07-22 Tim Horton <timothy_hor...@apple.com>
+
+ [iOS] Adjust the preview architecture
+ https://bugs.webkit.org/show_bug.cgi?id=147203
+ <rdar://problem/21945775>
+
+ Reviewed by Beth Dakin.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setAllowsLinkPreview:]): Deleted.
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView willMoveToWindow:]): Deleted.
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView _registerPreview]):
+ (-[WKContentView _unregisterPreview]):
+ (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+ (-[WKContentView _presentationRectForPreviewItemController:]):
+ (-[WKContentView _presentedViewControllerForPreviewItemController:]):
+ (-[WKContentView _previewItemController:commitPreview:]):
+ (-[WKContentView _previewItemController:willPresentPreview:forPosition:inSourceView:]):
+ (-[WKContentView _previewItemController:didDismissPreview:committing:]):
+ (-[WKContentView _presentationSnapshotForPreviewItemController:]):
+ (-[WKContentView _presentationRectsForPreviewItemController:]):
+ (-[WKContentView gestureRecognizerShouldBegin:]): Deleted.
+ (-[WKContentView _registerPreviewInWindow:]): Deleted.
+ (-[WKContentView _unregisterPreviewInWindow:]): Deleted.
+ (-[WKContentView previewViewControllerForPosition:inSourceView:]): Deleted.
+ (-[WKContentView commitPreviewViewController:]): Deleted.
+ (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]): Deleted.
+ (-[WKContentView didDismissPreviewViewController:committing:]): Deleted.
+ Register and unregister in setup/cleanupInteraction instead of when moving between windows.
+ Implement 'shouldBegin' instead of interacting directly with the recognizer.
+ Make use of system enums instead of our own.
+ Let UIPreviewItemController handle shrink-wrapping and the indicator view.
+
2015-07-22 Gyuyoung Kim <gyuyoung....@webkit.org>
[EFL] Support indexeddb for WK2
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (187192 => 187193)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-22 22:51:53 UTC (rev 187192)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-22 23:23:02 UTC (rev 187193)
@@ -48,6 +48,7 @@
#import <UIKit/UIPickerContentView_Private.h>
#import <UIKit/UIPickerView_Private.h>
#import <UIKit/UIPresentationController_Private.h>
+#import <UIKit/UIPreviewItemController.h>
#import <UIKit/UIResponder_Private.h>
#import <UIKit/UIScrollView_Private.h>
#import <UIKit/UIStringDrawing_Private.h>
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (187192 => 187193)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-07-22 22:51:53 UTC (rev 187192)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-07-22 23:23:02 UTC (rev 187193)
@@ -2998,12 +2998,6 @@
return;
_allowsLinkPreview = allowsLinkPreview;
-#if HAVE(LINK_PREVIEW)
- if (_allowsLinkPreview)
- [_contentView _registerPreviewInWindow:[_contentView window]];
- else
- [_contentView _unregisterPreviewInWindow:[_contentView window]];
-#endif
}
#else
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (187192 => 187193)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-07-22 22:51:53 UTC (rev 187192)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-07-22 23:23:02 UTC (rev 187193)
@@ -268,10 +268,6 @@
if (window) {
[defaultCenter removeObserver:self name:UIWindowDidMoveToScreenNotification object:window];
-#if HAVE(LINK_PREVIEW)
- if (_webView._allowsLinkPreview)
- [self _unregisterPreviewInWindow:window];
-#endif
if (!newWindow) {
ASSERT(_applicationStateTracker);
@@ -281,10 +277,6 @@
if (newWindow) {
[defaultCenter addObserver:self selector:@selector(_windowDidMoveToScreenNotification:) name:UIWindowDidMoveToScreenNotification object:newWindow];
-#if HAVE(LINK_PREVIEW)
- if (_webView._allowsLinkPreview)
- [self _registerPreviewInWindow:newWindow];
-#endif
[self _updateForScreen:newWindow.screen];
}
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (187192 => 187193)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-22 22:51:53 UTC (rev 187192)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-22 23:23:02 UTC (rev 187193)
@@ -94,12 +94,6 @@
UIWKAutocorrectionContextHandler autocorrectionContextHandler;
};
-enum class PreviewElementType {
- None = 0,
- Link,
- Image
-};
-
}
@interface WKContentView () {
@@ -127,7 +121,7 @@
RetainPtr<WKFormInputSession> _formInputSession;
RetainPtr<WKFileUploadPanel> _fileUploadPanel;
RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
- WebKit::PreviewElementType _previewType;
+ RetainPtr<UIPreviewItemController> _previewItemController;
std::unique_ptr<WebKit::SmartMagnificationController> _smartMagnificationController;
@@ -152,12 +146,7 @@
CGPoint _lastInteractionLocation;
WebKit::WKSelectionDrawingInfo _lastSelectionDrawingInfo;
-#if HAVE(LINK_PREVIEW)
- id <UIViewControllerPreviewing> _previewing;
-#endif
- RetainPtr<UIImageView> _previewIndicatorView;
-
BOOL _isEditable;
BOOL _showingTextStyleOptions;
BOOL _hasValidPositionInformation;
@@ -218,10 +207,10 @@
@end
#if HAVE(LINK_PREVIEW)
-@interface WKContentView (WKInteractionPreview) <UIViewControllerPreviewingDelegate>
+@interface WKContentView (WKInteractionPreview) <UIPreviewItemDelegate>
-- (void)_registerPreviewInWindow:(UIWindow *)window;
-- (void)_unregisterPreviewInWindow:(UIWindow *)window;
+- (void)_registerPreview;
+- (void)_unregisterPreview;
@end
#endif
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187192 => 187193)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-22 22:51:53 UTC (rev 187192)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-22 23:23:02 UTC (rev 187193)
@@ -341,6 +341,8 @@
[_longPressGestureRecognizer setDelegate:self];
[self addGestureRecognizer:_longPressGestureRecognizer.get()];
+ [self _registerPreview];
+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
_showingTextStyleOptions = NO;
@@ -396,6 +398,7 @@
_inspectorNodeSearchGestureRecognizer = nil;
}
+ [self _unregisterPreview];
if (_fileUploadPanel) {
[_fileUploadPanel setDelegate:nil];
[_fileUploadPanel dismiss];
@@ -965,16 +968,6 @@
}
}
- if (gestureRecognizer == _previewGestureRecognizer) {
- [self ensurePositionInformationIsUpToDate:point];
- if (_positionInformation.clickableElementName != "A" && _positionInformation.clickableElementName != "IMG")
- return NO;
-
- String absoluteLinkURL = _positionInformation.url;
- if (_positionInformation.clickableElementName == "A" && (absoluteLinkURL.isEmpty() || !WebCore::protocolIsInHTTPFamily(absoluteLinkURL)))
- return NO;
- }
-
return YES;
}
@@ -3203,49 +3196,109 @@
@implementation WKContentView (WKInteractionPreview)
-- (void)_registerPreviewInWindow:(UIWindow *)window
+- (void)_registerPreview
{
- _previewing = [[window.rootViewController registerForPreviewingWithSourceView:self] retain];
- _previewing.delegate = self;
- _previewGestureRecognizer = _previewing.presentationGestureRecognizer;
- [_previewGestureRecognizer setDelegate:self];
+ _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
+ [_previewItemController setDelegate:self];
+ _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
}
-- (void)_unregisterPreviewInWindow:(UIWindow *)window
+- (void)_unregisterPreview
{
- [window.rootViewController unregisterPreviewing:_previewing];
- _previewing.delegate = nil;
- [_previewGestureRecognizer setDelegate:nil];
+ [_previewItemController setDelegate:nil];
_previewGestureRecognizer = nil;
- [_previewing release];
- _previewing = nil;
+ _previewItemController = nil;
}
-- (UIViewController *)previewViewControllerForPosition:(CGPoint)position inSourceView:(UIView *)sourceView
+- (BOOL)_interactionShouldBeginFromPreviewItemController:(UIPreviewItemController *)controller forPosition:(CGPoint)position
{
- ASSERT(self == sourceView);
+ [self ensurePositionInformationIsUpToDate:position];
+ if (_positionInformation.clickableElementName != "A" && _positionInformation.clickableElementName != "IMG")
+ return NO;
+
+ String absoluteLinkURL = _positionInformation.url;
+ if (_positionInformation.clickableElementName == "A") {
+ if (absoluteLinkURL.isEmpty())
+ return NO;
+ if (WebCore::protocolIsInHTTPFamily(absoluteLinkURL))
+ return YES;
+ NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.url];
+ if ([[getDDDetectionControllerClass() tapAndHoldSchemes] containsObject:[targetURL scheme]])
+ return YES;
+ return NO;
+ }
+ return YES;
+}
- _previewType = PreviewElementType::None;
+- (NSDictionary *)_dataForPreviewItemController:(UIPreviewItemController *)controller atPosition:(CGPoint)position type:(UIPreviewItemType *)type
+{
+ *type = UIPreviewItemTypeNone;
- BOOL canShowImagePreview = _positionInformation.clickableElementName == "IMG";
+ id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
+ BOOL supportsImagePreview = [uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)];
+ BOOL canShowImagePreview = _positionInformation.clickableElementName == "IMG" && supportsImagePreview;
BOOL canShowLinkPreview = _positionInformation.clickableElementName == "A" || canShowImagePreview;
+ BOOL useImageURLForLink = NO;
+ if (canShowImagePreview && _positionInformation.isAnimatedImage) {
+ canShowImagePreview = NO;
+ canShowLinkPreview = YES;
+ useImageURLForLink = YES;
+ }
+
if (!canShowLinkPreview && !canShowImagePreview)
return nil;
String absoluteLinkURL = _positionInformation.url;
- if (absoluteLinkURL.isEmpty() || !WebCore::protocolIsInHTTPFamily(absoluteLinkURL)) {
+ if (!useImageURLForLink && (absoluteLinkURL.isEmpty() || !WebCore::protocolIsInHTTPFamily(absoluteLinkURL))) {
if (canShowLinkPreview && !canShowImagePreview)
return nil;
canShowLinkPreview = NO;
}
+ NSMutableDictionary *dataForPreview = [[[NSMutableDictionary alloc] init] autorelease];
+ if (canShowLinkPreview) {
+ *type = UIPreviewItemTypeLink;
+ if (useImageURLForLink)
+ dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
+ else
+ dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.url];
+ }
+ if (canShowImagePreview) {
+ *type = UIPreviewItemTypeImage;
+ dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
+ }
+
+ return dataForPreview;
+}
+
+- (CGRect)_presentationRectForPreviewItemController:(UIPreviewItemController *)controller
+{
+ return _positionInformation.bounds;
+}
+
+- (UIViewController *)_presentedViewControllerForPreviewItemController:(UIPreviewItemController *)controller
+{
id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
- if (canShowLinkPreview) {
- _previewType = PreviewElementType::Link;
- NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.url];
+ NSURL *targetURL = controller.previewData[UIPreviewDataLink];
+ URL coreTargetURL = targetURL;
+ bool isValidURLForImagePreview = !coreTargetURL.isEmpty() && (WebCore::protocolIsInHTTPFamily(coreTargetURL) || WebCore::protocolIs(coreTargetURL, "data"));
+
+ if ([_previewItemController type] == UIPreviewItemTypeLink) {
+ // Treat animated images like a link preview
+ if (isValidURLForImagePreview && _positionInformation.isAnimatedImage) {
+ RetainPtr<_WKActivatedElementInfo> animatedImageElementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
+
+ if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForAnimatedImageAtURL:defaultActions:elementInfo:imageSize:)]) {
+ RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:animatedImageElementInfo.get()];
+ _highlightLongPressCanClick = NO;
+ return [uiDelegate _webView:_webView previewViewControllerForAnimatedImageAtURL:targetURL defaultActions:actions.get() elementInfo:animatedImageElementInfo.get() imageSize:_positionInformation.image->size()];
+ }
+ }
+
RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
+
RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForLinkSheet:elementInfo.get()];
if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:defaultActions:elementInfo:)]) {
_highlightLongPressCanClick = NO;
@@ -3257,42 +3310,16 @@
_highlightLongPressCanClick = NO;
return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
}
-#if HAVE(SAFARI_SERVICES_FRAMEWORK)
- SFSafariViewController *previewViewController = [allocSFSafariViewControllerInstance() initWithURL:targetURL];
- previewViewController._showingLinkPreview = YES;
- previewViewController._activatedElementInfo = elementInfo.get();
- previewViewController._previewActions = actions.get();
- _highlightLongPressCanClick = NO;
- _page->startInteractionWithElementAtPosition(_positionInformation.point);
- return [previewViewController autorelease];
-#else
return nil;
-#endif
}
- if (canShowImagePreview) {
- if (![uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)])
+ if ([_previewItemController type] == UIPreviewItemTypeImage) {
+ if (!isValidURLForImagePreview)
return nil;
- String absoluteImageURL = _positionInformation.imageURL;
- if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
- return nil;
-
- NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
_page->startInteractionWithElementAtPosition(_positionInformation.point);
- // Treat animated images like a link preview
- if (_positionInformation.isAnimatedImage) {
- if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForAnimatedImageAtURL:defaultActions:elementInfo:imageSize:)]) {
- _previewType = PreviewElementType::Link;
- RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()];
- _highlightLongPressCanClick = NO;
- return [uiDelegate _webView:_webView previewViewControllerForAnimatedImageAtURL:targetURL defaultActions:actions.get() elementInfo:elementInfo.get() imageSize:_positionInformation.image->size()];
- }
- }
-
- _previewType = PreviewElementType::Image;
if ([uiDelegate respondsToSelector:@selector(_webView:willPreviewImageWithURL:)])
[uiDelegate _webView:_webView willPreviewImageWithURL:targetURL];
return [[[WKImagePreviewViewController alloc] initWithCGImage:_positionInformation.image->makeCGImageCopy() defaultActions:[_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()] elementInfo:elementInfo] autorelease];
@@ -3301,10 +3328,10 @@
return nil;
}
-- (void)commitPreviewViewController:(UIViewController *)viewController
+- (void)_previewItemController:(UIPreviewItemController *)controller commitPreview:(UIViewController *)viewController
{
id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
- if (_previewType == PreviewElementType::Image) {
+ if ([_previewItemController type] == UIPreviewItemTypeImage) {
if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)]) {
String absoluteImageURL = _positionInformation.imageURL;
if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
@@ -3320,58 +3347,16 @@
return;
}
-#if HAVE(SAFARI_SERVICES_FRAMEWORK)
- if (![viewController isKindOfClass:getSFSafariViewControllerClass()])
- return;
-
- SFSafariViewController *safariViewController = (SFSafariViewController *)viewController;
- safariViewController._showingLinkPreview = NO;
-
- viewController.transitioningDelegate = nil;
- viewController.modalPresentationStyle = UIModalPresentationFullScreen;
-
- UIViewController *presentingViewController = viewController.presentingViewController ?: self.window.rootViewController;
- [presentingViewController presentViewController:viewController animated:NO completion:nil];
-#endif
}
-- (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
+- (void)_previewItemController:(UIPreviewItemController *)controller willPresentPreview:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
{
[self _removeDefaultGestureRecognizers];
[self _cancelInteraction];
-
- [_previewIndicatorView removeFromSuperview];
-
- float deviceScaleFactor = _page->deviceScaleFactor();
-
- RefPtr<Image> image = _positionInformation.linkIndicator.contentImage;
- if (!image) {
- IntRect sourceRect = _positionInformation.bounds;
- const float marginInPoints = 4;
- sourceRect.inflate(marginInPoints * deviceScaleFactor);
- [[viewController presentationController] setSourceRect:sourceRect];
- [[viewController presentationController] setSourceView:self];
- return;
- }
-
- RetainPtr<UIImage> indicatorImage = adoptNS([[UIImage alloc] initWithCGImage:image->getCGImageRef()]);
- _previewIndicatorView = adoptNS([[UIImageView alloc] initWithImage:indicatorImage.get()]);
-
- const float cornerRadiusInPoints = 5;
- Path path = PathUtilities::pathWithShrinkWrappedRects(_positionInformation.linkIndicator.textRectsInBoundingRectCoordinates, cornerRadiusInPoints * deviceScaleFactor);
- RetainPtr<CAShapeLayer> maskLayer = adoptNS([[CAShapeLayer alloc] init]);
- [maskLayer setPath:path.ensurePlatformPath()];
-
- [_previewIndicatorView layer].mask = maskLayer.get();
- [_previewIndicatorView setFrame:_positionInformation.linkIndicator.textBoundingRectInRootViewCoordinates];
- [self addSubview:_previewIndicatorView.get()];
-
- [[viewController presentationController] setSourceRect:[_previewIndicatorView bounds]];
- [[viewController presentationController] setSourceView:_previewIndicatorView.get()];
}
-- (void)didDismissPreviewViewController:(UIViewController *)viewController committing:(BOOL)committing
+- (void)_previewItemController:(UIPreviewItemController *)controller didDismissPreview:(UIViewController *)viewController committing:(BOOL)committing
{
[self _addDefaultGestureRecognizers];
_page->stopInteraction();
@@ -3379,11 +3364,36 @@
id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:)])
[uiDelegate _webView:_webView didDismissPreviewViewController:viewController];
+}
- [_previewIndicatorView removeFromSuperview];
- _previewIndicatorView = nil;
+- (UIImage *)_presentationSnapshotForPreviewItemController:(UIPreviewItemController *)controller
+{
+ if (!_positionInformation.linkIndicator.contentImage)
+ return nullptr;
+ return [[[UIImage alloc] initWithCGImage:_positionInformation.linkIndicator.contentImage->getCGImageRef()] autorelease];
}
+- (NSArray *)_presentationRectsForPreviewItemController:(UIPreviewItemController *)controller
+{
+ RetainPtr<NSMutableArray> rectArray = adoptNS([[NSMutableArray alloc] init]);
+
+ if (_positionInformation.linkIndicator.contentImage) {
+ FloatPoint origin = _positionInformation.linkIndicator.textBoundingRectInRootViewCoordinates.location();
+ for (FloatRect& rect : _positionInformation.linkIndicator.textRectsInBoundingRectCoordinates) {
+ CGRect cgRect = rect;
+ cgRect.origin.x += origin.x();
+ cgRect.origin.y += origin.y();
+ [rectArray addObject:[NSValue valueWithCGRect:cgRect]];
+ }
+ } else {
+ const float marginInPx = 4 * _page->deviceScaleFactor();
+ CGRect cgRect = CGRectInset(_positionInformation.bounds, -marginInPx, -marginInPx);
+ [rectArray addObject:[NSValue valueWithCGRect:cgRect]];
+ }
+
+ return rectArray.autorelease();
+}
+
@end
#endif
