<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187193] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187193">187193</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 16:23:02 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187192 => 187193)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-07-22 Tim Horton <timothy_horton@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.
+
</ins><span class="cx"> 2015-07-22 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Support indexeddb for WK2
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (187192 => 187193)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #import <UIKit/UIPickerContentView_Private.h>
</span><span class="cx"> #import <UIKit/UIPickerView_Private.h>
</span><span class="cx"> #import <UIKit/UIPresentationController_Private.h>
</span><ins>+#import <UIKit/UIPreviewItemController.h>
</ins><span class="cx"> #import <UIKit/UIResponder_Private.h>
</span><span class="cx"> #import <UIKit/UIScrollView_Private.h>
</span><span class="cx"> #import <UIKit/UIStringDrawing_Private.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (187192 => 187193)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2998,12 +2998,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _allowsLinkPreview = allowsLinkPreview;
</span><del>-#if HAVE(LINK_PREVIEW)
- if (_allowsLinkPreview)
- [_contentView _registerPreviewInWindow:[_contentView window]];
- else
- [_contentView _unregisterPreviewInWindow:[_contentView window]];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (187192 => 187193)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -268,10 +268,6 @@
</span><span class="cx">
</span><span class="cx"> if (window) {
</span><span class="cx"> [defaultCenter removeObserver:self name:UIWindowDidMoveToScreenNotification object:window];
</span><del>-#if HAVE(LINK_PREVIEW)
- if (_webView._allowsLinkPreview)
- [self _unregisterPreviewInWindow:window];
-#endif
</del><span class="cx">
</span><span class="cx"> if (!newWindow) {
</span><span class="cx"> ASSERT(_applicationStateTracker);
</span><span class="lines">@@ -281,10 +277,6 @@
</span><span class="cx">
</span><span class="cx"> if (newWindow) {
</span><span class="cx"> [defaultCenter addObserver:self selector:@selector(_windowDidMoveToScreenNotification:) name:UIWindowDidMoveToScreenNotification object:newWindow];
</span><del>-#if HAVE(LINK_PREVIEW)
- if (_webView._allowsLinkPreview)
- [self _registerPreviewInWindow:newWindow];
-#endif
</del><span class="cx">
</span><span class="cx"> [self _updateForScreen:newWindow.screen];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (187192 => 187193)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -94,12 +94,6 @@
</span><span class="cx"> UIWKAutocorrectionContextHandler autocorrectionContextHandler;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum class PreviewElementType {
- None = 0,
- Link,
- Image
-};
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @interface WKContentView () {
</span><span class="lines">@@ -127,7 +121,7 @@
</span><span class="cx"> RetainPtr<WKFormInputSession> _formInputSession;
</span><span class="cx"> RetainPtr<WKFileUploadPanel> _fileUploadPanel;
</span><span class="cx"> RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
</span><del>- WebKit::PreviewElementType _previewType;
</del><ins>+ RetainPtr<UIPreviewItemController> _previewItemController;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebKit::SmartMagnificationController> _smartMagnificationController;
</span><span class="cx">
</span><span class="lines">@@ -152,12 +146,7 @@
</span><span class="cx"> CGPoint _lastInteractionLocation;
</span><span class="cx">
</span><span class="cx"> WebKit::WKSelectionDrawingInfo _lastSelectionDrawingInfo;
</span><del>-#if HAVE(LINK_PREVIEW)
- id <UIViewControllerPreviewing> _previewing;
-#endif
</del><span class="cx">
</span><del>- RetainPtr<UIImageView> _previewIndicatorView;
-
</del><span class="cx"> BOOL _isEditable;
</span><span class="cx"> BOOL _showingTextStyleOptions;
</span><span class="cx"> BOOL _hasValidPositionInformation;
</span><span class="lines">@@ -218,10 +207,10 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><del>-@interface WKContentView (WKInteractionPreview) <UIViewControllerPreviewingDelegate>
</del><ins>+@interface WKContentView (WKInteractionPreview) <UIPreviewItemDelegate>
</ins><span class="cx">
</span><del>-- (void)_registerPreviewInWindow:(UIWindow *)window;
-- (void)_unregisterPreviewInWindow:(UIWindow *)window;
</del><ins>+- (void)_registerPreview;
+- (void)_unregisterPreview;
</ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187192 => 187193)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -341,6 +341,8 @@
</span><span class="cx"> [_longPressGestureRecognizer setDelegate:self];
</span><span class="cx"> [self addGestureRecognizer:_longPressGestureRecognizer.get()];
</span><span class="cx">
</span><ins>+ [self _registerPreview];
+
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
</span><span class="cx"> _showingTextStyleOptions = NO;
</span><span class="cx">
</span><span class="lines">@@ -396,6 +398,7 @@
</span><span class="cx"> _inspectorNodeSearchGestureRecognizer = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ [self _unregisterPreview];
</ins><span class="cx"> if (_fileUploadPanel) {
</span><span class="cx"> [_fileUploadPanel setDelegate:nil];
</span><span class="cx"> [_fileUploadPanel dismiss];
</span><span class="lines">@@ -965,16 +968,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
- }
-
</del><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3203,49 +3196,109 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKContentView (WKInteractionPreview)
</span><span class="cx">
</span><del>-- (void)_registerPreviewInWindow:(UIWindow *)window
</del><ins>+- (void)_registerPreview
</ins><span class="cx"> {
</span><del>- _previewing = [[window.rootViewController registerForPreviewingWithSourceView:self] retain];
- _previewing.delegate = self;
- _previewGestureRecognizer = _previewing.presentationGestureRecognizer;
- [_previewGestureRecognizer setDelegate:self];
</del><ins>+ _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
+ [_previewItemController setDelegate:self];
+ _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_unregisterPreviewInWindow:(UIWindow *)window
</del><ins>+- (void)_unregisterPreview
</ins><span class="cx"> {
</span><del>- [window.rootViewController unregisterPreviewing:_previewing];
- _previewing.delegate = nil;
- [_previewGestureRecognizer setDelegate:nil];
</del><ins>+ [_previewItemController setDelegate:nil];
</ins><span class="cx"> _previewGestureRecognizer = nil;
</span><del>- [_previewing release];
- _previewing = nil;
</del><ins>+ _previewItemController = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (UIViewController *)previewViewControllerForPosition:(CGPoint)position inSourceView:(UIView *)sourceView
</del><ins>+- (BOOL)_interactionShouldBeginFromPreviewItemController:(UIPreviewItemController *)controller forPosition:(CGPoint)position
</ins><span class="cx"> {
</span><del>- ASSERT(self == sourceView);
</del><ins>+ [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;
+}
</ins><span class="cx">
</span><del>- _previewType = PreviewElementType::None;
</del><ins>+- (NSDictionary *)_dataForPreviewItemController:(UIPreviewItemController *)controller atPosition:(CGPoint)position type:(UIPreviewItemType *)type
+{
+ *type = UIPreviewItemTypeNone;
</ins><span class="cx">
</span><del>- BOOL canShowImagePreview = _positionInformation.clickableElementName == "IMG";
</del><ins>+ id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
+ BOOL supportsImagePreview = [uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)];
+ BOOL canShowImagePreview = _positionInformation.clickableElementName == "IMG" && supportsImagePreview;
</ins><span class="cx"> BOOL canShowLinkPreview = _positionInformation.clickableElementName == "A" || canShowImagePreview;
</span><ins>+ BOOL useImageURLForLink = NO;
</ins><span class="cx">
</span><ins>+ if (canShowImagePreview && _positionInformation.isAnimatedImage) {
+ canShowImagePreview = NO;
+ canShowLinkPreview = YES;
+ useImageURLForLink = YES;
+ }
+
</ins><span class="cx"> if (!canShowLinkPreview && !canShowImagePreview)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> String absoluteLinkURL = _positionInformation.url;
</span><del>- if (absoluteLinkURL.isEmpty() || !WebCore::protocolIsInHTTPFamily(absoluteLinkURL)) {
</del><ins>+ if (!useImageURLForLink && (absoluteLinkURL.isEmpty() || !WebCore::protocolIsInHTTPFamily(absoluteLinkURL))) {
</ins><span class="cx"> if (canShowLinkPreview && !canShowImagePreview)
</span><span class="cx"> return nil;
</span><span class="cx"> canShowLinkPreview = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ 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
+{
</ins><span class="cx"> id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</span><span class="cx">
</span><del>- if (canShowLinkPreview) {
- _previewType = PreviewElementType::Link;
- NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.url];
</del><ins>+ 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()];
+ }
+ }
+
</ins><span class="cx"> RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</span><ins>+
</ins><span class="cx"> RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForLinkSheet:elementInfo.get()];
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:defaultActions:elementInfo:)]) {
</span><span class="cx"> _highlightLongPressCanClick = NO;
</span><span class="lines">@@ -3257,42 +3310,16 @@
</span><span class="cx"> _highlightLongPressCanClick = NO;
</span><span class="cx"> return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
</span><span class="cx"> }
</span><del>-#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
</del><span class="cx"> return nil;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>- if (canShowImagePreview) {
- if (![uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)])
</del><ins>+ if ([_previewItemController type] == UIPreviewItemTypeImage) {
+ if (!isValidURLForImagePreview)
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><del>- String absoluteImageURL = _positionInformation.imageURL;
- if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
- return nil;
-
- NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
</del><span class="cx"> RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</span><span class="cx"> _page->startInteractionWithElementAtPosition(_positionInformation.point);
</span><span class="cx">
</span><del>- // 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;
</del><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:willPreviewImageWithURL:)])
</span><span class="cx"> [uiDelegate _webView:_webView willPreviewImageWithURL:targetURL];
</span><span class="cx"> return [[[WKImagePreviewViewController alloc] initWithCGImage:_positionInformation.image->makeCGImageCopy() defaultActions:[_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()] elementInfo:elementInfo] autorelease];
</span><span class="lines">@@ -3301,10 +3328,10 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)commitPreviewViewController:(UIViewController *)viewController
</del><ins>+- (void)_previewItemController:(UIPreviewItemController *)controller commitPreview:(UIViewController *)viewController
</ins><span class="cx"> {
</span><span class="cx"> id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</span><del>- if (_previewType == PreviewElementType::Image) {
</del><ins>+ if ([_previewItemController type] == UIPreviewItemTypeImage) {
</ins><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)]) {
</span><span class="cx"> String absoluteImageURL = _positionInformation.imageURL;
</span><span class="cx"> if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
</span><span class="lines">@@ -3320,58 +3347,16 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
</del><ins>+- (void)_previewItemController:(UIPreviewItemController *)controller willPresentPreview:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
</ins><span class="cx"> {
</span><span class="cx"> [self _removeDefaultGestureRecognizers];
</span><span class="cx">
</span><span class="cx"> [self _cancelInteraction];
</span><del>-
- [_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()];
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didDismissPreviewViewController:(UIViewController *)viewController committing:(BOOL)committing
</del><ins>+- (void)_previewItemController:(UIPreviewItemController *)controller didDismissPreview:(UIViewController *)viewController committing:(BOOL)committing
</ins><span class="cx"> {
</span><span class="cx"> [self _addDefaultGestureRecognizers];
</span><span class="cx"> _page->stopInteraction();
</span><span class="lines">@@ -3379,11 +3364,36 @@
</span><span class="cx"> id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:)])
</span><span class="cx"> [uiDelegate _webView:_webView didDismissPreviewViewController:viewController];
</span><ins>+}
</ins><span class="cx">
</span><del>- [_previewIndicatorView removeFromSuperview];
- _previewIndicatorView = nil;
</del><ins>+- (UIImage *)_presentationSnapshotForPreviewItemController:(UIPreviewItemController *)controller
+{
+ if (!_positionInformation.linkIndicator.contentImage)
+ return nullptr;
+ return [[[UIImage alloc] initWithCGImage:_positionInformation.linkIndicator.contentImage->getCGImageRef()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (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();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>