<!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>[176483] 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/176483">176483</a></dd>
<dt>Author</dt> <dd>conrad_shultz@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 16:07:46 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Page previews should have a margin.
https://bugs.webkit.org/show_bug.cgi?id=138990
Reviewed by Beth Dakin.
Enclose the WKWebView (or client-supplied preview view) in a container slightly larger
than the preview view. Adjust sizing code to accommodate the margin.
* UIProcess/mac/WKActionMenuController.mm:
(+[WKPagePreviewViewController previewPadding]):
Return the total amount of fixed padding surrounding the preview
(-[WKPagePreviewViewController loadView]):
Store the actual previewView in an ivar so that clients can distinguish it from the container
view; wrap the preview in a container view; set frames appropriately.
(-[WKActionMenuController _createPreviewPopover]):
Update to reflect method rename; supplement the popover size with the fixed padding.
(-[WKActionMenuController _preferredPopoverSizeWithPreviewPadding:]):
Renamed from -_preferredPopoverSize; account for the fixed padding when computing the preferred size.
(-[WKActionMenuController _clearPreviewPopover]):
Use the previewView ivar instead of the view controller's view.
(-[WKActionMenuController pagePreviewViewControllerWasClicked:]):
Ditto.
(-[WKActionMenuController _preferredPopoverSize]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176482 => 176483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-22 00:04:58 UTC (rev 176482)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-22 00:07:46 UTC (rev 176483)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-11-21 Conrad Shultz <conrad_shultz@apple.com>
+
+ Page previews should have a margin.
+ https://bugs.webkit.org/show_bug.cgi?id=138990
+
+ Reviewed by Beth Dakin.
+
+ Enclose the WKWebView (or client-supplied preview view) in a container slightly larger
+ than the preview view. Adjust sizing code to accommodate the margin.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (+[WKPagePreviewViewController previewPadding]):
+ Return the total amount of fixed padding surrounding the preview
+ (-[WKPagePreviewViewController loadView]):
+ Store the actual previewView in an ivar so that clients can distinguish it from the container
+ view; wrap the preview in a container view; set frames appropriately.
+ (-[WKActionMenuController _createPreviewPopover]):
+ Update to reflect method rename; supplement the popover size with the fixed padding.
+ (-[WKActionMenuController _preferredPopoverSizeWithPreviewPadding:]):
+ Renamed from -_preferredPopoverSize; account for the fixed padding when computing the preferred size.
+ (-[WKActionMenuController _clearPreviewPopover]):
+ Use the previewView ivar instead of the view controller's view.
+ (-[WKActionMenuController pagePreviewViewControllerWasClicked:]):
+ Ditto.
+ (-[WKActionMenuController _preferredPopoverSize]): Deleted.
+
</ins><span class="cx"> 2014-11-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r176415): Can get stuck, unable to invoke any DataDetectors popovers
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176482 => 176483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-22 00:04:58 UTC (rev 176482)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-22 00:07:46 UTC (rev 176483)
</span><span class="lines">@@ -71,6 +71,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+static const CGFloat previewViewInset = 3;
+
</ins><span class="cx"> @class WKPagePreviewViewController;
</span><span class="cx">
</span><span class="cx"> @protocol WKPagePreviewViewControllerDelegate <NSObject>
</span><span class="lines">@@ -82,12 +84,15 @@
</span><span class="cx"> @public
</span><span class="cx"> NSSize _mainViewSize;
</span><span class="cx"> RetainPtr<NSURL> _url;
</span><ins>+ RetainPtr<NSView> _previewView;
</ins><span class="cx"> id <WKPagePreviewViewControllerDelegate> _delegate;
</span><span class="cx"> CGFloat _popoverToViewScale;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithPageURL:(NSURL *)URL mainViewSize:(NSSize)size popoverToViewScale:(CGFloat)scale;
</span><span class="cx">
</span><ins>++ (NSSize)previewPadding;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKPagePreviewViewController
</span><span class="lines">@@ -104,26 +109,42 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (NSSize)previewPadding
+{
+ return NSMakeSize(2 * previewViewInset, 2 * previewViewInset);
+}
+
</ins><span class="cx"> - (void)loadView
</span><span class="cx"> {
</span><span class="cx"> NSRect defaultFrame = NSMakeRect(0, 0, _mainViewSize.width, _mainViewSize.height);
</span><del>- RetainPtr<NSView> previewView = [_delegate pagePreviewViewController:self viewForPreviewingURL:_url.get() initialFrameSize:defaultFrame.size];
- if (!previewView) {
</del><ins>+ _previewView = [_delegate pagePreviewViewController:self viewForPreviewingURL:_url.get() initialFrameSize:defaultFrame.size];
+ if (!_previewView) {
</ins><span class="cx"> RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:defaultFrame]);
</span><span class="cx"> [webView _setIgnoresNonWheelMouseEvents:YES];
</span><span class="cx"> if (_url) {
</span><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:_url.get()];
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx"> }
</span><del>- previewView = webView;
</del><ins>+ _previewView = webView;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ RetainPtr<NSClickGestureRecognizer> clickRecognizer = adoptNS([[NSClickGestureRecognizer alloc] initWithTarget:self action:@selector(_clickRecognized:)]);
+ [_previewView addGestureRecognizer:clickRecognizer.get()];
+
+ NSRect previewFrame = [_previewView frame];
+ NSRect containerFrame = previewFrame;
+ containerFrame.size.width += 2 * previewViewInset;
+ containerFrame.size.height += 2 * previewViewInset;
+ previewFrame = NSOffsetRect(previewFrame, previewViewInset, previewViewInset);
+
+ RetainPtr<NSView> containerView = adoptNS([[NSView alloc] initWithFrame:containerFrame]);
+ [containerView addSubview:_previewView.get()];
+ [_previewView setFrame:previewFrame];
+
</ins><span class="cx"> // Setting the webView bounds will scale it to 75% of the _mainViewSize.
</span><del>- [previewView setBounds:NSMakeRect(0, 0, _mainViewSize.width / _popoverToViewScale, _mainViewSize.height / _popoverToViewScale)];
</del><ins>+ [_previewView setBounds:NSMakeRect(0, 0, _mainViewSize.width / _popoverToViewScale, _mainViewSize.height / _popoverToViewScale)];
</ins><span class="cx">
</span><del>- RetainPtr<NSClickGestureRecognizer> clickRecognizer = adoptNS([[NSClickGestureRecognizer alloc] initWithTarget:self action:@selector(_clickRecognized:)]);
- [previewView addGestureRecognizer:clickRecognizer.get()];
- self.view = previewView.get();
</del><ins>+ self.view = containerView.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_clickRecognized:(NSGestureRecognizer *)gestureRecognizer
</span><span class="lines">@@ -350,8 +371,12 @@
</span><span class="cx"> NSURL *url = [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
</span><span class="cx"> _popoverOriginRect = hitTestResult->elementBoundingBox();
</span><span class="cx">
</span><del>- NSSize popoverSize = [self _preferredPopoverSize];
</del><ins>+ NSSize previewPadding = [WKPagePreviewViewController previewPadding];
+ NSSize popoverSize = [self _preferredPopoverSizeWithPreviewPadding:previewPadding];
</ins><span class="cx"> CGFloat actualPopoverToViewScale = popoverSize.width / NSWidth(_wkView.bounds);
</span><ins>+ popoverSize.width += previewPadding.width;
+ popoverSize.height += previewPadding.height;
+
</ins><span class="cx"> _previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
</span><span class="cx"> _previewViewController->_delegate = self;
</span><span class="cx"> [_previewViewController loadView];
</span><span class="lines">@@ -387,12 +412,14 @@
</span><span class="cx"> return NSMakeSize(1324, 940);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSSize)_preferredPopoverSize
</del><ins>+- (NSSize)_preferredPopoverSizeWithPreviewPadding:(NSSize)previewPadding
</ins><span class="cx"> {
</span><span class="cx"> static const CGFloat preferredPopoverToViewScale = 0.75;
</span><del>- static const CGFloat screenPadding = 40;
</del><ins>+ static const NSSize screenPadding = {40, 40};
</ins><span class="cx"> static const NSSize smallestPopoverSize = NSMakeSize(500, 300);
</span><span class="cx">
</span><ins>+ const NSSize effectivePadding = NSMakeSize(screenPadding.width + previewPadding.width, screenPadding.height + previewPadding.height);
+
</ins><span class="cx"> NSWindow *window = _wkView.window;
</span><span class="cx"> NSRect originScreenRect = [window convertRectToScreen:[_wkView convertRect:_popoverOriginRect toView:nil]];
</span><span class="cx"> NSRect screenFrame = window.screen.visibleFrame;
</span><span class="lines">@@ -403,15 +430,15 @@
</span><span class="cx">
</span><span class="cx"> CGFloat availableSpaceAbove = NSMaxY(screenFrame) - NSMaxY(originScreenRect);
</span><span class="cx"> CGFloat availableSpaceBelow = NSMinY(originScreenRect) - NSMinY(screenFrame);
</span><del>- CGFloat maxAvailableVerticalSpace = fmax(availableSpaceAbove, availableSpaceBelow) - screenPadding;
- NSSize maxSpaceAvailableOnYEdge = NSMakeSize(screenFrame.size.width - screenPadding, maxAvailableVerticalSpace);
</del><ins>+ CGFloat maxAvailableVerticalSpace = fmax(availableSpaceAbove, availableSpaceBelow) - effectivePadding.height;
+ NSSize maxSpaceAvailableOnYEdge = NSMakeSize(screenFrame.size.width - effectivePadding.height, maxAvailableVerticalSpace);
</ins><span class="cx"> if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnYEdge) && targetSizeFitsInAvailableSpace(targetSize, largestPopoverSize))
</span><span class="cx"> return targetSize;
</span><span class="cx">
</span><span class="cx"> CGFloat availableSpaceAtLeft = NSMinX(originScreenRect) - NSMinX(screenFrame);
</span><span class="cx"> CGFloat availableSpaceAtRight = NSMaxX(screenFrame) - NSMaxX(originScreenRect);
</span><del>- CGFloat maxAvailableHorizontalSpace = fmax(availableSpaceAtLeft, availableSpaceAtRight) - screenPadding;
- NSSize maxSpaceAvailableOnXEdge = NSMakeSize(maxAvailableHorizontalSpace, screenFrame.size.height - screenPadding);
</del><ins>+ CGFloat maxAvailableHorizontalSpace = fmax(availableSpaceAtLeft, availableSpaceAtRight) - effectivePadding.width;
+ NSSize maxSpaceAvailableOnXEdge = NSMakeSize(maxAvailableHorizontalSpace, screenFrame.size.height - effectivePadding.width);
</ins><span class="cx"> if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnXEdge) && targetSizeFitsInAvailableSpace(targetSize, largestPopoverSize))
</span><span class="cx"> return targetSize;
</span><span class="cx">
</span><span class="lines">@@ -458,7 +485,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> if (_previewViewController) {
</span><span class="cx"> _previewViewController->_delegate = nil;
</span><del>- [_wkView _finishPreviewingURL:_previewViewController->_url.get() withPreviewView:[_previewViewController view]];
</del><ins>+ [_wkView _finishPreviewingURL:_previewViewController->_url.get() withPreviewView:_previewViewController->_previewView.get()];
</ins><span class="cx"> _previewViewController = nil;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1063,7 +1090,7 @@
</span><span class="cx"> - (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController
</span><span class="cx"> {
</span><span class="cx"> if (NSURL *url = pagePreviewViewController->_url.get())
</span><del>- [_wkView _handleClickInPreviewView:pagePreviewViewController.view URL:url];
</del><ins>+ [_wkView _handleClickInPreviewView:pagePreviewViewController->_previewView.get() URL:url];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>