<!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>[187979] branches/safari-601.1.46-branch/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/187979">187979</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 12:57:19 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187764">r187764</a>. rdar://problem/22077836</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2015-08-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187764. rdar://problem/22077836
+
+ 2015-08-03 Beth Dakin <bdakin@apple.com>
+
+ Need WKWebView API to enable/disable link preview
+ https://bugs.webkit.org/show_bug.cgi?id=147573
+ -and corresponding-
+ rdar://problem/22077836
+
+ Reviewed by Dan Bernstein.
+
+ WKView implementation.
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+
+ New API. Call into WKView to handle Mac.
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView allowsLinkPreview]):
+ (-[WKWebView setAllowsLinkPreview:]):
+
+ Remove the SPI declaration from WKWebViewPrivate in order to make this API.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
+ Handle the Mac side.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView viewDidMoveToWindow]):
+ (-[WKView initWithFrame:processPool:configuration:webView:]):
+ (-[WKView allowsBackForwardNavigationGestures]):
+ (-[WKView allowsLinkPreview]):
+ (-[WKView setAllowsLinkPreview:]):
+
+ Don’t register previews when link preview is prevented.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _registerPreview]):
+
+2015-08-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r187756. rdar://problem/22119648
</span><span class="cx">
</span><span class="cx"> 2015-08-03 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -129,6 +129,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)setMagnification:(double)magnification centeredAtPoint:(NSPoint)point;
</span><span class="cx">
</span><ins>+- (void)setAllowsLinkPreview:(BOOL)allowsLinkPreview;
+- (BOOL)allowsLinkPreview;
+
</ins><span class="cx"> - (void)saveBackForwardSnapshotForCurrentItem;
</span><span class="cx"> - (void)saveBackForwardSnapshotForItem:(WKBackForwardListItemRef)item;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -231,6 +231,12 @@
</span><span class="cx"> */
</span><span class="cx"> @property (WK_NULLABLE_PROPERTY nonatomic, copy) NSString *customUserAgent WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><ins>+/*! @abstract A Boolean value indicating whether link preview is allowed for any
+ links inside this WKWebView.
+ @discussion The default value is NO on iOS and YES on Mac.
+ */
+@property (nonatomic) BOOL allowsLinkPreview WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> /*! @abstract The scroll view associated with the web view.
</span><span class="cx"> */
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -351,7 +351,6 @@
</span><span class="cx"> [self _updateScrollViewBackground];
</span><span class="cx">
</span><span class="cx"> _viewportMetaTagWidth = -1;
</span><del>- _allowsLinkPreview = YES;
</del><span class="cx">
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><span class="cx">
</span><span class="lines">@@ -659,6 +658,35 @@
</span><span class="cx"> return toAPI(_page.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)allowsLinkPreview
+{
+#if PLATFORM(MAC)
+ return [_wkView allowsLinkPreview];
+#elif PLATFORM(IOS)
+ return _allowsLinkPreview;
+#endif
+}
+
+- (void)setAllowsLinkPreview:(BOOL)allowsLinkPreview
+{
+#if PLATFORM(MAC)
+ [_wkView setAllowsLinkPreview:allowsLinkPreview];
+ return;
+#elif PLATFORM(IOS)
+ if (_allowsLinkPreview == allowsLinkPreview)
+ return;
+
+ _allowsLinkPreview = allowsLinkPreview;
+
+#if HAVE(LINK_PREVIEW)
+ if (_allowsLinkPreview)
+ [_contentView _registerPreview];
+ else
+ [_contentView _unregisterPreview];
+#endif // HAVE(LINK_PREVIEW)
+#endif // PLATFORM(IOS)
+}
+
</ins><span class="cx"> #pragma mark iOS-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -3026,21 +3054,8 @@
</span><span class="cx"> return (_WKWebViewPrintFormatter *)viewPrintFormatter;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_allowsLinkPreview
-{
- return _allowsLinkPreview;
-}
</del><ins>+#else // #if PLATFORM(IOS)
</ins><span class="cx">
</span><del>-- (void)_setAllowsLinkPreview:(BOOL)allowsLinkPreview
-{
- if (_allowsLinkPreview == allowsLinkPreview)
- return;
-
- _allowsLinkPreview = allowsLinkPreview;
-}
-
-#else
-
</del><span class="cx"> #pragma mark - OS X-specific methods
</span><span class="cx">
</span><span class="cx"> - (NSColor *)_pageExtendedBackgroundColor
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -131,9 +131,6 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) _WKWebViewPrintFormatter *_webViewPrintFormatter;
</span><span class="cx">
</span><del>-// Indicating whether link preview is allowed. The default value is YES.
-@property (nonatomic, getter=_allowsLinkPreview, setter=_setAllowsLinkPreview:) BOOL _allowsLinkPreview WK_AVAILABLE(NA, WK_IOS_TBA);
-
</del><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange;
</span><span class="cx"> - (void)_endInteractiveObscuredInsetsChange;
</span><span class="cx"> - (void)_hideContentUntilNextUpdate;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -261,6 +261,7 @@
</span><span class="cx"> BOOL _ignoresNonWheelEvents;
</span><span class="cx"> BOOL _ignoresAllEvents;
</span><span class="cx"> BOOL _allowsBackForwardNavigationGestures;
</span><ins>+ BOOL _allowsLinkPreview;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WKViewLayoutStrategy> _layoutStrategy;
</span><span class="cx"> CGSize _minimumViewSize;
</span><span class="lines">@@ -2706,7 +2707,7 @@
</span><span class="cx"> [self _accessibilityRegisterUIProcessTokens];
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>- if (_data->_immediateActionGestureRecognizer && ![[self gestureRecognizers] containsObject:_data->_immediateActionGestureRecognizer.get()] && !_data->_ignoresNonWheelEvents)
</del><ins>+ if (_data->_immediateActionGestureRecognizer && ![[self gestureRecognizers] containsObject:_data->_immediateActionGestureRecognizer.get()] && !_data->_ignoresNonWheelEvents && _data->_allowsLinkPreview)
</ins><span class="cx"> [self addGestureRecognizer:_data->_immediateActionGestureRecognizer.get()];
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="lines">@@ -3797,6 +3798,8 @@
</span><span class="cx"> [workspaceNotificationCenter addObserver:self selector:@selector(_activeSpaceDidChange:) name:NSWorkspaceActiveSpaceDidChangeNotification object:nil];
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><ins>+ _data->_allowsLinkPreview = YES;
+
</ins><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><span class="cx"> _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
</span><span class="cx"> _data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self recognizer:_data->_immediateActionGestureRecognizer.get()]);
</span><span class="lines">@@ -4221,6 +4224,26 @@
</span><span class="cx"> return _data->_allowsBackForwardNavigationGestures;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)allowsLinkPreview
+{
+ return _data->_allowsLinkPreview;
+}
+
+- (void)setAllowsLinkPreview:(BOOL)allowsLinkPreview
+{
+ if (_data->_allowsLinkPreview == allowsLinkPreview)
+ return;
+
+ _data->_allowsLinkPreview = allowsLinkPreview;
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ if (!allowsLinkPreview)
+ [self removeGestureRecognizer:_data->_immediateActionGestureRecognizer.get()];
+ else if (NSGestureRecognizer *immediateActionRecognizer = _data->_immediateActionGestureRecognizer.get())
+ [self addGestureRecognizer:immediateActionRecognizer];
+#endif
+}
+
</ins><span class="cx"> - (void)_setIgnoresAllEvents:(BOOL)ignoresAllEvents
</span><span class="cx"> {
</span><span class="cx"> _data->_ignoresAllEvents = ignoresAllEvents;
</span><span class="lines">@@ -4244,8 +4267,10 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> if (ignoresNonWheelEvents)
</span><span class="cx"> [self removeGestureRecognizer:_data->_immediateActionGestureRecognizer.get()];
</span><del>- else if (NSGestureRecognizer *immediateActionRecognizer = _data->_immediateActionGestureRecognizer.get())
- [self addGestureRecognizer:immediateActionRecognizer];
</del><ins>+ else if (NSGestureRecognizer *immediateActionRecognizer = _data->_immediateActionGestureRecognizer.get()) {
+ if (_data->_allowsLinkPreview)
+ [self addGestureRecognizer:immediateActionRecognizer];
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187978 => 187979)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-05 19:57:16 UTC (rev 187978)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-05 19:57:19 UTC (rev 187979)
</span><span class="lines">@@ -3200,6 +3200,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_registerPreview
</span><span class="cx"> {
</span><ins>+ if (!_webView.allowsLinkPreview)
+ return;
+
</ins><span class="cx"> _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
</span><span class="cx"> [_previewItemController setDelegate:self];
</span><span class="cx"> _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
</span></span></pre>
</div>
</div>
</body>
</html>