<!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>[175682] branches/safari-600.3-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/175682">175682</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 22:32:51 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175646">r175646</a>. <rdar://problems/18887218></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175681 => 175682)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 06:30:19 UTC (rev 175681)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 06:32:51 UTC (rev 175682)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2014-11-05 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175646. <rdar://problem/18887218>
+
+ 2014-11-05 Conrad Shultz <conrad_shultz@apple.com>
+
+ It should be possible to open a page preview by clicking on it
+ https://bugs.webkit.org/show_bug.cgi?id=138445
+
+ Reviewed by Tim Horton.
+
+ Add a click recognizer to WKPagePreviewViewController and plumb it through to WKActionMenuController.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ Declare <WKPagePreviewViewControllerDelegate>, currently home to just a single method.
+ (-[WKPagePreviewViewController loadView]):
+ Configure and add a click gesture recognizer to the WKWebView.
+ (-[WKPagePreviewViewController _clickRecognized:]):
+ Gesture recognizer action; send -pagePreviewViewControllerWasClicked: to the delegate.
+ (-[WKActionMenuController willDestroyView:]):
+ Extract code to -_clearPreviewPopover.
+ (-[WKActionMenuController didCloseMenu:withEvent:]):
+ Ditto.
+ (-[WKActionMenuController _createPreviewPopoverForURL:]):
+ Set ourself as the delegate of the page preview controller.
+ (-[WKActionMenuController _clearPreviewPopover]):
+ Extracted from various other methods; if appropriate, nil out the preview view controller's delegate.
+ (-[WKActionMenuController popoverWillClose:]):
+ Extract code to -_clearPreviewPopover.
+ (-[WKActionMenuController pagePreviewViewControllerWasClicked:]):
+ WKPagePreviewViewControllerDelegate method; open the URL of the clicked page.
+
+
+2014-11-05 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r175645. <rdar://problem/18887140>
</span><span class="cx">
</span><span class="cx"> 2014-11-05 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175681 => 175682)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 06:30:19 UTC (rev 175681)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 06:32:51 UTC (rev 175682)
</span><span class="lines">@@ -74,12 +74,18 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><ins>+
+@class WKPagePreviewViewController;
+
+@protocol WKPagePreviewViewControllerDelegate <NSObject>
+- (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController;
+@end
+
</ins><span class="cx"> @interface WKPagePreviewViewController : NSViewController {
</span><span class="cx"> @public
</span><span class="cx"> NSSize _mainViewSize;
</span><del>-
-@private
</del><span class="cx"> RetainPtr<NSURL> _url;
</span><ins>+ id <WKPagePreviewViewControllerDelegate> _delegate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithPageURL:(NSURL *)URL;
</span><span class="lines">@@ -110,10 +116,22 @@
</span><span class="cx">
</span><span class="cx"> // Setting the webView bounds will scale it to 75% of the _mainViewSize.
</span><span class="cx"> [webView setBounds:NSMakeRect(0, 0, _mainViewSize.width / popoverToViewScale, _mainViewSize.height / popoverToViewScale)];
</span><ins>+
+ RetainPtr<NSClickGestureRecognizer> clickRecognizer = adoptNS([[NSClickGestureRecognizer alloc] initWithTarget:self action:@selector(_clickRecognized:)]);
+ [webView addGestureRecognizer:clickRecognizer.get()];
</ins><span class="cx"> self.view = webView.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_clickRecognized:(NSGestureRecognizer *)gestureRecognizer
+{
+ [_delegate pagePreviewViewControllerWasClicked:self];
+}
+
</ins><span class="cx"> @end
</span><ins>+
+@interface WKActionMenuController () <WKPagePreviewViewControllerDelegate>
+@end
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @implementation WKActionMenuController
</span><span class="lines">@@ -137,8 +155,7 @@
</span><span class="cx"> _page = nullptr;
</span><span class="cx"> _wkView = nullptr;
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><del>- [_previewPopover setDelegate:nil];
- _previewPopover = nil;
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="lines">@@ -196,11 +213,8 @@
</span><span class="cx"> if (_type == kWKActionMenuDataDetectedItem && menu.numberOfItems > 1)
</span><span class="cx"> [self _hideTextIndicator];
</span><span class="cx">
</span><del>- if (!_shouldKeepPreviewPopoverOpen) {
- [_previewPopover close];
- [_previewPopover setDelegate:nil];
- _previewPopover = nil;
- }
</del><ins>+ if (!_shouldKeepPreviewPopoverOpen)
+ [self _clearPreviewPopover];
</ins><span class="cx">
</span><span class="cx"> _state = ActionMenuState::None;
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><span class="lines">@@ -297,6 +311,7 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WKPagePreviewViewController> previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url]);
</span><span class="cx"> previewViewController->_mainViewSize = _wkView.bounds.size;
</span><ins>+ previewViewController->_delegate = self;
</ins><span class="cx">
</span><span class="cx"> _previewPopover = adoptNS([[NSPopover alloc] init]);
</span><span class="cx"> [_previewPopover setBehavior:NSPopoverBehaviorTransient];
</span><span class="lines">@@ -330,6 +345,18 @@
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span><span class="cx">
</span><ins>+- (void)_clearPreviewPopover
+{
+#if WK_API_ENABLED
+ if (WKPagePreviewViewController *pagePreviewViewController = (WKPagePreviewViewController *)[_previewPopover contentViewController])
+ pagePreviewViewController->_delegate = nil;
+#endif
+
+ [_previewPopover close];
+ [_previewPopover setDelegate:nil];
+ _previewPopover = nil;
+}
+
</ins><span class="cx"> #pragma mark Image actions
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForImage
</span><span class="lines">@@ -604,7 +631,7 @@
</span><span class="cx"> - (void)popoverWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> _shouldKeepPreviewPopoverOpen = NO;
</span><del>- _previewPopover = nil;
</del><ins>+ [self _clearPreviewPopover];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Menu Items
</span><span class="lines">@@ -779,6 +806,18 @@
</span><span class="cx"> [_wkView.actionMenu addItem:item];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if WK_API_ENABLED
+
+#pragma mark WKPagePreviewViewControllerDelegate
+
+- (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController
+{
+ if (NSURL *url = pagePreviewViewController->_url.get())
+ [[NSWorkspace sharedWorkspace] openURL:url];
+}
+
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>