<!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>[184276] branches/safari-601.1.32-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/184276">184276</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-13 00:01:03 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184061">r184061</a>. rdar://problem/20856497</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessiosWKContentViewmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessiosWKContentViewInteractionh">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184275 => 184276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 06:48:02 UTC (rev 184275)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 07:01:03 UTC (rev 184276)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-05-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184061.
+
+ 2015-05-10 Yongjun Zhang <yongjun_zhang@apple.com>
+
+ Use preview view controller from WebKitSystemInterface.
+ https://bugs.webkit.org/show_bug.cgi?id=144836
+
+ Add a property _allowsLinkPreview to WKWebView so that we can turn on/off preview at runtime. Also,
+ for client that doesn't provide preview view controller, use the default view controller prepared
+ by WebKitSystemInterface.
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView _allowsLinkPreview]):
+ (-[WKWebView _setAllowsLinkPreview:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h: Add _allowsLinkPreview property
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView willMoveToWindow:]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _registerPreviewInWindow:]):
+ (-[WKContentView _unregisterPreviewInWindow:]):
+ (-[WKContentView previewViewControllerForPosition:inSourceView:]): : For client that doesn't provide
+ preview delegate, use preview view controller in WebKitSystemInterface.
+ (-[WKContentView commitPreviewViewController:]):
+
+2015-05-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r183933.
</span><span class="cx">
</span><span class="cx"> 2015-05-07 Ada Chan <adachan@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184275 => 184276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-13 06:48:02 UTC (rev 184275)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-13 07:01:03 UTC (rev 184276)
</span><span class="lines">@@ -169,6 +169,7 @@
</span><span class="cx"> CGSize _maximumUnobscuredSizeOverride;
</span><span class="cx"> CGRect _inputViewBounds;
</span><span class="cx"> CGFloat _viewportMetaTagWidth;
</span><ins>+ BOOL _allowsLinkPreview;
</ins><span class="cx">
</span><span class="cx"> UIEdgeInsets _obscuredInsets;
</span><span class="cx"> BOOL _haveSetObscuredInsets;
</span><span class="lines">@@ -331,6 +332,7 @@
</span><span class="cx"> [self _updateScrollViewBackground];
</span><span class="cx">
</span><span class="cx"> _viewportMetaTagWidth = -1;
</span><ins>+ _allowsLinkPreview = YES;
</ins><span class="cx">
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><span class="cx">
</span><span class="lines">@@ -2796,6 +2798,25 @@
</span><span class="cx"> return (_WKWebViewPrintFormatter *)viewPrintFormatter;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_allowsLinkPreview
+{
+ return _allowsLinkPreview;
+}
+
+- (void)_setAllowsLinkPreview:(BOOL)allowsLinkPreview
+{
+ if (_allowsLinkPreview == allowsLinkPreview)
+ return;
+
+ _allowsLinkPreview = allowsLinkPreview;
+#if HAVE(LINK_PREVIEW)
+ if (_allowsLinkPreview)
+ [_contentView _registerPreviewInWindow:[_contentView window]];
+ else
+ [_contentView _unregisterPreviewInWindow:[_contentView window]];
+#endif
+}
+
</ins><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> #pragma mark - OS X-specific methods
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (184275 => 184276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-05-13 06:48:02 UTC (rev 184275)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-05-13 07:01:03 UTC (rev 184276)
</span><span class="lines">@@ -127,6 +127,9 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) _WKWebViewPrintFormatter *_webViewPrintFormatter;
</span><span class="cx">
</span><ins>+// 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);
+
</ins><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange;
</span><span class="cx"> - (void)_endInteractiveObscuredInsetsChange;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (184275 => 184276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-05-13 06:48:02 UTC (rev 184275)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-05-13 07:01:03 UTC (rev 184276)
</span><span class="lines">@@ -269,19 +269,17 @@
</span><span class="cx">
</span><span class="cx"> if (window) {
</span><span class="cx"> [defaultCenter removeObserver:self name:UIWindowDidMoveToScreenNotification object:window];
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
- [window.rootViewController unregisterPreviewSourceView:self];
- [_previewGestureRecognizer setDelegate:nil];
- _previewGestureRecognizer.clear();
</del><ins>+#if HAVE(LINK_PREVIEW)
+ if (_webView._allowsLinkPreview)
+ [self _unregisterPreviewInWindow:window];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</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 __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
- [newWindow.rootViewController registerPreviewSourceView:self previewingDelegate:self];
- _previewGestureRecognizer = self.gestureRecognizers.lastObject;
- [_previewGestureRecognizer setDelegate:self];
</del><ins>+#if HAVE(LINK_PREVIEW)
+ if (_webView._allowsLinkPreview)
+ [self _registerPreviewInWindow:newWindow];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (184275 => 184276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-05-13 06:48:02 UTC (rev 184275)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-05-13 07:01:03 UTC (rev 184276)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/LinkPreviewDefines.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class Color;
</span><span class="cx"> class FloatQuad;
</span><span class="lines">@@ -200,8 +204,11 @@
</span><span class="cx"> - (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if HAVE(LINK_PREVIEW)
</ins><span class="cx"> @interface WKContentView (WKInteractionPreview) <UIViewControllerPreviewingDelegate>
</span><ins>+
+- (void)_registerPreviewInWindow:(UIWindow *)window;
+- (void)_unregisterPreviewInWindow:(UIWindow *)window;
</ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (184275 => 184276)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-05-13 06:48:02 UTC (rev 184275)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-05-13 07:01:03 UTC (rev 184276)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><span class="cx"> #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
</span><ins>+#import <WebKitSystemInterfaceIOS.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -3097,10 +3098,24 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if HAVE(LINK_PREVIEW)
</ins><span class="cx">
</span><span class="cx"> @implementation WKContentView (WKInteractionPreview)
</span><span class="cx">
</span><ins>+- (void)_registerPreviewInWindow:(UIWindow *)window
+{
+ [window.rootViewController registerPreviewSourceView:self previewingDelegate:self];
+ _previewGestureRecognizer = self.gestureRecognizers.lastObject;
+ [_previewGestureRecognizer setDelegate:self];
+}
+
+- (void)_unregisterPreviewInWindow:(UIWindow *)window
+{
+ [window.rootViewController unregisterPreviewSourceView:self];
+ [_previewGestureRecognizer setDelegate:nil];
+ _previewGestureRecognizer = nil;
+}
+
</ins><span class="cx"> - (UIViewController *)previewViewControllerForPosition:(CGPoint)position inSourceView:(UIView *)sourceView
</span><span class="cx"> {
</span><span class="cx"> ASSERT(self == sourceView);
</span><span class="lines">@@ -3119,14 +3134,23 @@
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:)])
</span><span class="cx"> return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
</span><span class="cx">
</span><del>- return nil;
</del><ins>+ return WKGetPreviewViewController(targetURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)commitPreviewViewController:(UIViewController *)viewController
</span><span class="cx"> {
</span><span class="cx"> id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</span><del>- if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedViewController:)])
</del><ins>+ if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedViewController:)]) {
</ins><span class="cx"> [uiDelegate _webView:_webView commitPreviewedViewController:viewController];
</span><ins>+ return;
+ }
+
+ UIViewController *presentingViewController = viewController.presentingViewController ?: self.window.rootViewController;
+ WKWillCommitPreviewViewController(viewController);
+
+ viewController.transitioningDelegate = nil;
+ viewController.modalPresentationStyle = UIModalPresentationFullScreen;
+ [presentingViewController presentViewController:viewController animated:NO completion:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
</span></span></pre>
</div>
</div>
</body>
</html>